[tor-commits] [translation/tails-greeter] Update translations for tails-greeter
translation at torproject.org
translation at torproject.org
Sat Jun 10 10:47:00 UTC 2017
commit bc26bc1b70507017f3876a8aa46fb387cd14e637
Author: Translation commit bot <translation at torproject.org>
Date: Sat Jun 10 10:46:55 2017 +0000
Update translations for tails-greeter
---
ach/ach.po | 306 ++++++++++++++++++++++++-----------
ady/ady.po | 306 ++++++++++++++++++++++++-----------
af/af.po | 308 ++++++++++++++++++++++++-----------
ak/ak.po | 306 ++++++++++++++++++++++++-----------
am/am.po | 306 ++++++++++++++++++++++++-----------
ar/ar.po | 376 +++++++++++++++++++++++++++---------------
arn/arn.po | 306 ++++++++++++++++++++++++-----------
ast/ast.po | 324 +++++++++++++++++++++++++------------
az/az.po | 378 ++++++++++++++++++++++++++++---------------
ba/ba.po | 306 ++++++++++++++++++++++++-----------
be/be.po | 376 +++++++++++++++++++++++++++---------------
bg/bg.po | 378 ++++++++++++++++++++++++++++---------------
bn/bn.po | 322 ++++++++++++++++++++++++------------
bn_BD/bn_BD.po | 306 ++++++++++++++++++++++++-----------
bn_IN/bn_IN.po | 306 ++++++++++++++++++++++++-----------
bo/bo.po | 306 ++++++++++++++++++++++++-----------
br/br.po | 306 ++++++++++++++++++++++++-----------
brx/brx.po | 306 ++++++++++++++++++++++++-----------
bs/bs.po | 320 ++++++++++++++++++++++++------------
ca/ca.po | 380 ++++++++++++++++++++++++++++---------------
ceb/ceb.po | 306 ++++++++++++++++++++++++-----------
cs/cs.po | 376 +++++++++++++++++++++++++++---------------
csb/csb.po | 306 ++++++++++++++++++++++++-----------
cv/cv.po | 312 ++++++++++++++++++++++++-----------
cy/cy.po | 342 ++++++++++++++++++++++++++-------------
da/da.po | 378 ++++++++++++++++++++++++++++---------------
de/de.po | 376 +++++++++++++++++++++++++++---------------
dz/dz.po | 306 ++++++++++++++++++++++++-----------
el/el.po | 378 ++++++++++++++++++++++++++++---------------
en_GB/en_GB.po | 376 +++++++++++++++++++++++++++---------------
eo/eo.po | 378 ++++++++++++++++++++++++++++---------------
es/es.po | 378 ++++++++++++++++++++++++++++---------------
es_AR/es_AR.po | 378 ++++++++++++++++++++++++++++---------------
es_CL/es_CL.po | 308 ++++++++++++++++++++++++-----------
es_CO/es_CO.po | 314 ++++++++++++++++++++++++-----------
es_MX/es_MX.po | 376 +++++++++++++++++++++++++++---------------
et/et.po | 310 ++++++++++++++++++++++++-----------
eu/eu.po | 378 ++++++++++++++++++++++++++++---------------
fa/fa.po | 378 ++++++++++++++++++++++++++++---------------
fi/fi.po | 378 ++++++++++++++++++++++++++++---------------
fil/fil.po | 324 +++++++++++++++++++++++++------------
fo/fo.po | 310 ++++++++++++++++++++++++-----------
fr/fr.po | 380 ++++++++++++++++++++++++++++---------------
fr_CA/fr_CA.po | 384 ++++++++++++++++++++++++++++---------------
fur/fur.po | 306 ++++++++++++++++++++++++-----------
fy/fy.po | 326 +++++++++++++++++++++++++------------
ga/ga.po | 306 ++++++++++++++++++++++++-----------
gd/gd.po | 310 ++++++++++++++++++++++++-----------
gl/gl.po | 378 ++++++++++++++++++++++++++++---------------
gu/gu.po | 308 ++++++++++++++++++++++++-----------
gu_IN/gu_IN.po | 306 ++++++++++++++++++++++++-----------
gun/gun.po | 306 ++++++++++++++++++++++++-----------
ha/ha.po | 306 ++++++++++++++++++++++++-----------
he/he.po | 378 ++++++++++++++++++++++++++++---------------
hi/hi.po | 316 +++++++++++++++++++++++++-----------
hr/hr.po | 334 ++++++++++++++++++++++++++------------
hr_HR/hr_HR.po | 378 ++++++++++++++++++++++++++++---------------
ht/ht.po | 306 ++++++++++++++++++++++++-----------
hu/hu.po | 378 ++++++++++++++++++++++++++++---------------
hy/hy.po | 306 ++++++++++++++++++++++++-----------
ia/ia.po | 314 ++++++++++++++++++++++++-----------
id/id.po | 382 ++++++++++++++++++++++++++++---------------
is/is.po | 378 ++++++++++++++++++++++++++++---------------
it/it.po | 380 ++++++++++++++++++++++++++++---------------
ja/ja.po | 376 +++++++++++++++++++++++++++---------------
jv/jv.po | 306 ++++++++++++++++++++++++-----------
ka/ka.po | 334 ++++++++++++++++++++++++++------------
kk/kk.po | 308 ++++++++++++++++++++++++-----------
km/km.po | 378 ++++++++++++++++++++++++++++---------------
kn/kn.po | 354 ++++++++++++++++++++++++++--------------
ko/ko.po | 380 ++++++++++++++++++++++++++++---------------
ko_KR/ko_KR.po | 354 ++++++++++++++++++++++++++--------------
ku/ku.po | 306 ++++++++++++++++++++++++-----------
ku_IQ/ku_IQ.po | 320 ++++++++++++++++++++++++------------
kw/kw.po | 306 ++++++++++++++++++++++++-----------
ky/ky.po | 308 ++++++++++++++++++++++++-----------
la/la.po | 378 ++++++++++++++++++++++++++++---------------
lb/lb.po | 378 ++++++++++++++++++++++++++++---------------
lg/lg.po | 306 ++++++++++++++++++++++++-----------
ln/ln.po | 306 ++++++++++++++++++++++++-----------
lo/lo.po | 314 ++++++++++++++++++++++++-----------
lt/lt.po | 378 ++++++++++++++++++++++++++++---------------
lv/lv.po | 380 ++++++++++++++++++++++++++++---------------
mg/mg.po | 306 ++++++++++++++++++++++++-----------
mi/mi.po | 306 ++++++++++++++++++++++++-----------
mk/mk.po | 306 ++++++++++++++++++++++++-----------
ml/ml.po | 306 ++++++++++++++++++++++++-----------
mn/mn.po | 306 ++++++++++++++++++++++++-----------
mr/mr.po | 314 ++++++++++++++++++++++++-----------
ms_MY/ms_MY.po | 344 ++++++++++++++++++++++++++-------------
mt/mt.po | 306 ++++++++++++++++++++++++-----------
my/my.po | 316 +++++++++++++++++++++++++-----------
nah/nah.po | 306 ++++++++++++++++++++++++-----------
nap/nap.po | 306 ++++++++++++++++++++++++-----------
nb/nb.po | 378 ++++++++++++++++++++++++++++---------------
nds/nds.po | 306 ++++++++++++++++++++++++-----------
ne/ne.po | 306 ++++++++++++++++++++++++-----------
nl/nl.po | 378 ++++++++++++++++++++++++++++---------------
nl_BE/nl_BE.po | 364 +++++++++++++++++++++++++++--------------
nn/nn.po | 376 +++++++++++++++++++++++++++---------------
nso/nso.po | 306 ++++++++++++++++++++++++-----------
oc/oc.po | 306 ++++++++++++++++++++++++-----------
om/om.po | 308 ++++++++++++++++++++++++-----------
or/or.po | 306 ++++++++++++++++++++++++-----------
pa/pa.po | 356 ++++++++++++++++++++++++++--------------
pap/pap.po | 306 ++++++++++++++++++++++++-----------
pl/pl.po | 378 ++++++++++++++++++++++++++++---------------
pms/pms.po | 306 ++++++++++++++++++++++++-----------
ps/ps.po | 306 ++++++++++++++++++++++++-----------
pt/pt.po | 378 ++++++++++++++++++++++++++++---------------
pt_BR/pt_BR.po | 378 ++++++++++++++++++++++++++++---------------
ro/ro.po | 378 ++++++++++++++++++++++++++++---------------
ru/ru.po | 380 ++++++++++++++++++++++++++++---------------
ru at petr1708/ru at petr1708.po | 312 ++++++++++++++++++++++++-----------
scn/scn.po | 306 ++++++++++++++++++++++++-----------
sco/sco.po | 306 ++++++++++++++++++++++++-----------
si_LK/si_LK.po | 354 ++++++++++++++++++++++++++--------------
sk/sk.po | 376 +++++++++++++++++++++++++++---------------
sk_SK/sk_SK.po | 382 ++++++++++++++++++++++++++++---------------
sl/sl.po | 354 ++++++++++++++++++++++++++--------------
sl_SI/sl_SI.po | 376 +++++++++++++++++++++++++++---------------
sn/sn.po | 306 ++++++++++++++++++++++++-----------
so/so.po | 306 ++++++++++++++++++++++++-----------
son/son.po | 306 ++++++++++++++++++++++++-----------
sq/sq.po | 378 ++++++++++++++++++++++++++++---------------
sr/sr.po | 358 ++++++++++++++++++++++++++--------------
sr at latin/sr at latin.po | 378 ++++++++++++++++++++++++++++---------------
st/st.po | 306 ++++++++++++++++++++++++-----------
su/su.po | 306 ++++++++++++++++++++++++-----------
sv/sv.po | 380 ++++++++++++++++++++++++++++---------------
sw/sw.po | 306 ++++++++++++++++++++++++-----------
szl/szl.po | 306 ++++++++++++++++++++++++-----------
ta/ta.po | 376 +++++++++++++++++++++++++++---------------
te/te.po | 306 ++++++++++++++++++++++++-----------
te_IN/te_IN.po | 308 ++++++++++++++++++++++++-----------
templates/tails-greeter.pot | 386 +++++++++++++++++++++++++++++---------------
tg/tg.po | 306 ++++++++++++++++++++++++-----------
th/th.po | 360 +++++++++++++++++++++++++++--------------
ti/ti.po | 306 ++++++++++++++++++++++++-----------
tk/tk.po | 306 ++++++++++++++++++++++++-----------
tr/tr.po | 380 ++++++++++++++++++++++++++++---------------
tzm/tzm.po | 308 ++++++++++++++++++++++++-----------
ug at Arab/ug at Arab.po | 318 ++++++++++++++++++++++++------------
uk/uk.po | 376 +++++++++++++++++++++++++++---------------
ur/ur.po | 316 +++++++++++++++++++++++++-----------
ur_PK/ur_PK.po | 318 ++++++++++++++++++++++++------------
uz/uz.po | 314 ++++++++++++++++++++++++-----------
ve/ve.po | 306 ++++++++++++++++++++++++-----------
vi/vi.po | 378 ++++++++++++++++++++++++++++---------------
wa/wa.po | 306 ++++++++++++++++++++++++-----------
wo/wo.po | 306 ++++++++++++++++++++++++-----------
zh_CN/zh_CN.po | 380 ++++++++++++++++++++++++++++---------------
zh_HK/zh_HK.po | 386 +++++++++++++++++++++++++++++---------------
zh_TW/zh_TW.po | 378 ++++++++++++++++++++++++++++---------------
zu/zu.po | 306 ++++++++++++++++++++++++-----------
155 files changed, 35392 insertions(+), 16792 deletions(-)
diff --git a/ach/ach.po b/ach/ach.po
index 4333dfd..ff9edc5 100644
--- a/ach/ach.po
+++ b/ach/ach.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ady/ady.po b/ady/ady.po
index 5450d7b..a8301e6 100644
--- a/ady/ady.po
+++ b/ady/ady.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Adyghe (http://www.transifex.com/otf/torproject/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/af/af.po b/af/af.po
index f3e19d6..204ad36 100644
--- a/af/af.po
+++ b/af/af.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Sleutelwoord"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ak/ak.po b/ak/ak.po
index dcaa991..3fb52b5 100644
--- a/ak/ak.po
+++ b/ak/ak.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Akan (http://www.transifex.com/otf/torproject/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/am/am.po b/am/am.po
index 85a5778..6e8ba16 100644
--- a/am/am.po
+++ b/am/am.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: am\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ar/ar.po b/ar/ar.po
index a7f613e..64536ef 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -28,170 +28,290 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "إلى الأمام"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "الدخول"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "اهلاً بك في تيلز"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "هل ترغب في استخدام مساحة دائمة علي القرص الصلب؟"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">الوثائق</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "نعم"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "لا"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "عبارة المرور:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "للقراءة فقط؟"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>عبارة المرور غير صحيحة. الرجاء المحاولة مرة اخرى</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "خيارات أكثر؟"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "كلمة السر الخاصة بالإدارة"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">الوثائق</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "ادخل كلمة السر الخاصة بالإدارة في حال كنت تحتاج إلي عمل تغييرات إدارية. \nوإلا سيعطل هذا الخيار لتحسين الأمن."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "كلمة السر:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "تحقق من أو اعد كتابة كلمة السر:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>كلمات السر غير متطابقة</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "انتحال عنوان MAC "
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">الوثائق</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "انتحال عناوين MAC أخرى يخفي أرقام تسلسل بطاقات شبكتك للشبكات المحلية. هذا الأمر يساعدك على إخفاء موقعك الجغرافي."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "انتحال عناوين وحدات التحكم في وصول الوسائط أأمن بشكل عام ولكنه أيضا قد يثير الشكوك أو يسبب مشاكل في الاتصال بالشبكة."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "انتحال عناوين جميع وحدات التحكم في وصول الوسائط"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "تكوين الشبكة"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">الوثائق</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "اتصال هذا الحاسب بالإنترنت خالٍ من العوائق. أنت تود الاتصال بشبكة Tor بشكل مباشر."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "اتصال هذا الحاسب الإنترنت مراقب أو مصفى أو له وكيل. عليك تكوين إعدادات الجسر أو جدار الحماية أو الوكيل."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "عطل جميع الشبكات"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "."
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "اللغة"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "محلي"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "التصميم"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist فشل و كود العودة هو %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup فشل و كود العودة هو %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist فشل و كود العودة هو %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "آخر..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/arn/arn.po b/arn/arn.po
index 1610c8c..0c603c5 100644
--- a/arn/arn.po
+++ b/arn/arn.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Mapudungun (http://www.transifex.com/otf/torproject/language/arn/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: arn\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ast/ast.po b/ast/ast.po
index 6564df9..cbe3ecf 100644
--- a/ast/ast.po
+++ b/ast/ast.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Aniciar sesión"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienllegáu a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Pallabra clave:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Namái llectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Más opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Alministración de contraseña"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/az/az.po b/az/az.po
index 09cb7ec..80288ad 100644
--- a/az/az.po
+++ b/az/az.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-09 12:37+0000\n"
-"Last-Translator: Nikafn <appone6 at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,170 +21,290 @@ msgstr ""
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Yönləndir"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Daxil Ol"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tails -ə Xoş Gəldiniz"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Davamlı istifadə?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Sənədləşmə</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Bəli"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Xeyr"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Köməkçi ifadə:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Yalnız-Oxunulur?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Yanlış ifadə. Lütfən, bir daha sına.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Daha çox seçənək?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrasiya şifrəsi"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Sənədləşmə</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Administrator vəzifələrini yerinə yetirməyə ehtiyacın olduqda administratorun şifrəsini daxil et.\nƏks halda daha yaxşı təhlükəsizlik üçün bu deaktivə ediləcək."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Şifrə:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Şifrəni Təsdiqləyin:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Şifrələr eyni deyil</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC ünvan aldadıcı"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Sənədləşmə</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC ünvanların aldadılması yerli şəbəkəyə olan şəbəkə kartlarının seriya nömrəsini gizlədir. Bu sənə coğrafi məkanını gizləməyə şərait yarada bilər."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "MAC ünvan aldadıcısını istifadə etmək ümumiyyətlə daha təhlükəsizdir, amma bu əlavə olaraq şübhə yarada və ya şəbəkə əlaqə problemlərinə səbəb ola bilər."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Bütün MAC ünvanlarını aldat"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Şəbəkə konfiqurasiyası"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Sənədləşmə</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Bu kompüterin internet əlaqəsi maneələrdən təmizlənmişdir. Sən bir başa Tor şəbəkəsinə qoşulmaq istəyirsən."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Bu kompüterin internet əlaqəsi senzuradan keçirilmiş, filterlənmiş və ya proksilənmişdir. Sən körpü, təhlükəsizlik divarı və ya proksi parametrlərini konfiqurasiya etməlisən."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Bütün şəbəkəni söndür"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Dil"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Dil"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Görünüş"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "canlı-davamlılıq %(returncode)s geri şifrə ilə alınmadı:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "ölüparametr crypt %(returncode)s geri şifrə ilə alınmadı:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "canlı-davamlılıq %(returncode)s geri şifrə ilə alınmadı:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Digər..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ba/ba.po b/ba/ba.po
index 5443eb1..51de0b4 100644
--- a/ba/ba.po
+++ b/ba/ba.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bashkir (http://www.transifex.com/otf/torproject/language/ba/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ba\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/be/be.po b/be/be.po
index f34d518..1c160d2 100644
--- a/be/be.po
+++ b/be/be.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Далей"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Увайсці"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Вітаем у Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Выкарыстоўваць сталае сховішча?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Дакументацыя</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Так"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Не"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Пароль:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Толькі чытанне?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Нядзейсны пароль. Паспрабуйце ізноў.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Больш настáўленняў?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Пароль адміністратара"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Дакументацыя</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Задайце пароль да конта адміністратара, калі вам трэба выконваць адміністратыўныя задачы.\nІнакш ён будзе адключаны для большай бяспекі."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Пароль:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Пацверджанне пароля:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Паролі не супадаюць</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Падмена MAC-адрасаў"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Дакументацыя</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Падмена MAC-адрасаў хавае серыйны нумар вашай сеткавай карты ў лакальных сетках. Гэта можа дапамагчы вам схаваць геаграфічнае знаходжанне."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Зазвычай, бяспечней падмяняць MAC-адрасы, але гэта можа выклікаць падазронасць ці стварыць праблемы са злучэннем."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Падмяняць усе MAC-адрасы"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Канфігурацыя сеткі"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Дакументацыя</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Злучэнне гэтага кампутара з інтэрнэтам пазбаўлена перашкод. Вы хацелі б злучыцца непасрэдна з сеткай Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Злучэнне гэтага кампутара з інтэрнэтам цэнзуруецца, фільтруецца ці праходзіць праз проксі. Вам трэба наставіць сеткавы мост, файрвол ці параметры проксі."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Мова"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Лакаль"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Раскладка"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist зваліўся з кодам %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup зваліўся з кодам %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist зваліўся з кодам %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Іншае..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/bg/bg.po b/bg/bg.po
index b993c5f..6d58b4a 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-24 16:30+0200\n"
-"PO-Revision-Date: 2016-05-26 09:26+0000\n"
-"Last-Translator: Gabriel Radev <gabosss at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Напред"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Вход"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Добре дошли в Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Използвай постоянство?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Документация</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Да"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Не"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Тайна фраза:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Само за четене?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Грешна Тайна фраза. Моля, опитайте отново.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Повече възможности?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Администраторската парола"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Документация</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Въведете Администраторска парола, в случай, че е необходимо за изпълнение на административни задачи. ⏎ В противен случай ще бъде забранено за по-голяма сигурност."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Парола:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Потвърди Паролата:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Паролите не съвпадат</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Подправяне на MAC адрес"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Документация</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Подправянето на MAC адрес скрива серийная номер на вашата мрежова карта. Това може да помагне за прикриване на географското ви положение."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "По принцип е по-безопасно да се прави спуфинг на MAC адреси, но това може също така да пробуди съмнение или да причини проблеми мрежова връзка."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Спуфинг за всички MAC адреси"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Конфигурацията на мрежата"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Документация</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Интернетът на този компютър няма пречки. Бихте искали да се свържете директно към Тор."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Интернет връзката на този компютър е цензурирана, филтрирана или прокси. Трябва да конфигурирате настройките на bridge, защитна стена или прокси."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Изключи всички мрежи"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "-"
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Език"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Локал"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Оформление"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:⏎ %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup failed with return code %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Други..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/bn/bn.po b/bn/bn.po
index f191459..c42c77a 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-03 08:57+0000\n"
-"Last-Translator: Mahmud Numan <mahmudnuman at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ফরওয়ার্ড"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "টেইলস এ স্বাগতম"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "হ্যা"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "না"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "পাসওয়ার্ড:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "ভাষা"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "অন্যান্য..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po
index deda016..8558f40 100644
--- a/bn_BD/bn_BD.po
+++ b/bn_BD/bn_BD.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/bn_IN/bn_IN.po b/bn_IN/bn_IN.po
index c6e2045..e464e73 100644
--- a/bn_IN/bn_IN.po
+++ b/bn_IN/bn_IN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bengali (India) (http://www.transifex.com/otf/torproject/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: bn_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/bo/bo.po b/bo/bo.po
index 8bdbb98..9aa4812 100644
--- a/bo/bo.po
+++ b/bo/bo.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Tibetan (http://www.transifex.com/otf/torproject/language/bo/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: bo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/br/br.po b/br/br.po
index 6e7843b..4143fb8 100644
--- a/br/br.po
+++ b/br/br.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: br\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/brx/brx.po b/brx/brx.po
index b39607b..082a9c5 100644
--- a/brx/brx.po
+++ b/brx/brx.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bodo (http://www.transifex.com/otf/torproject/language/brx/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: brx\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/bs/bs.po b/bs/bs.po
index 068d62b..c50b6d0 100644
--- a/bs/bs.po
+++ b/bs/bs.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: bs\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Proslijedi"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Šifra"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
+
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Podešavanja mreže"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ca/ca.po b/ca/ca.po
index 10584f4..f2947a0 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -4,7 +4,7 @@
#
# Translators:
# Albert <provisionalib at hotmail.com>, 2013
-# Assumpta Anglada <assumptaanglada at gmail.com>, 2014
+# Assumpta <assumptaanglada at gmail.com>, 2014
# David Anglada <codiobert at codiobert.es>, 2014
# laia_, 2015
# Norike Abe <norikeave at hotmail.com>, 2013
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: laia_\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Endavant"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Entra"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Benvingut al Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utilitzar persistència?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentació</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Sí"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de contrasenya:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Només Escriptura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>La frase de contrasenya és incorrecta. Torna-ho a provar.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Més opcions?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Contrasenya d'administració"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentació</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Entreu una contrasenya d'administració si heu de realitzar tasques d'administració.\nEn cas contrari, es deshabilitarà per a una major seguretat."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contrasenya:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Comprova la contrasenya:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>La contrasenya no concorda</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Falsificació d'adreça MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentació</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "La falsificació d'adreces MAC oculta el número de sèrie de la targeta de xarxa a les xarxes locals. Això pot ajudar a ocultar la ubicació geogràfica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "En general, és més segur simular les adreces MAC, però també podria aixecar sospites o provocar problemes de connexió de xarxa."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Falsifica totes les adreces MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuració de xarxa"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentació</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connexió a Internet d'aquest equip està lliure d'obstacles. Podeu connectar-vos directament a la xarxa Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connexió a Internet d'aquest equip està censurada, filtrada o conté intermediaris. Cal configurar el pont, el tallafocs o la configuració del servidor intermediari."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Desactiva tota la xarxa"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Llengua"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Configuració local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disseny"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ha fallat amb el codi de retorn %(returncode)s:⏎\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ha fallat amb el codi de retorn %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ha fallat amb el codi de retorn %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Altres..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ceb/ceb.po b/ceb/ceb.po
index 4655b85..7dfed02 100644
--- a/ceb/ceb.po
+++ b/ceb/ceb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Cebuano (http://www.transifex.com/otf/torproject/language/ceb/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ceb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/cs/cs.po b/cs/cs.po
index 3aefab1..908226f 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
"MIME-Version: 1.0\n"
@@ -23,170 +23,290 @@ msgstr ""
"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Vpřed"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Přihlásit se"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Vítejte v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Použít trvale?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentace</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ano"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Přístupové heslo:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Jenom pro čtení?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Špatné heslo. Zkuste to prosím znovu.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Více možností?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrační heslo"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentace</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Vložte administrační heslo v případě, že chcete provádět administrační úlohy.\nJinak budou adminstrační úlohy vypnuty pro vyšší bezpečnosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Heslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrďte heslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Hesla se neshodují</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Falšování MAC adresy"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentace</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Podvrhování MAC adresy schovává sériové číslo vašich síťových karet lokálním sítím. Toto může pomoci schovat vaši geografickou polohu."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Je celkově bezpečnější schovat MAC adresy, ale také to může vznést podezření nebo způsobit problémy s připojením k síti."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoofovat všechny MAC adresy"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfigurace sítě"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentace</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internetové připojení tohoto počítače nemá v cestě překážky. Budete se chtít připojit přímo do sítě Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internetové připojení tohoto počítače je cenzurované, filtrované, nebo je použito proxy. Potřebujete nastavit most, firewall nebo proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Zakázat všechny sítě"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jazyk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Místní"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Rozvržení"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist selhal a vrátil kód %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup selhal a vrátil kód %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist selhal a vrátil kód %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostatní..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/csb/csb.po b/csb/csb.po
index b527963..9654133 100644
--- a/csb/csb.po
+++ b/csb/csb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kashubian (http://www.transifex.com/otf/torproject/language/csb/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: csb\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/cv/cv.po b/cv/cv.po
index d05559f..c042563 100644
--- a/cv/cv.po
+++ b/cv/cv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chuvash (http://www.transifex.com/otf/torproject/language/cv/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: cv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Çапла"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Çук"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Кĕме сăмах:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/cy/cy.po b/cy/cy.po
index de2bb43..026506b 100644
--- a/cy/cy.po
+++ b/cy/cy.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Christopher Griffiths <transifex at cgriff.co.uk>, 2016
+# ianto <transifex at cgriff.co.uk>, 2016
# Huw Waters <huwwaters at gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Christopher Griffiths <transifex at cgriff.co.uk>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: cy\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ymlaen"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Mewngofnodi"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Croeso i Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Defnyddio parhad?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.cy.html\">Dogfennaeth</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ia"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Na"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.cy.html\">Dogfennaeth</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Gwirio Cyfrinair:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.cy.html\">Dogfennaeth</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.cy.html\">Dogfennaeth</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Iaith"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lleolaeth"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Arall..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/da/da.po b/da/da.po
index d78457a..ffc45b0 100644
--- a/da/da.po
+++ b/da/da.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-01-19 09:28+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Frem"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Log in"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkommen til Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Brug vedholdenhed?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nej"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Adgangsfrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skrivebeskyttet?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Forkert adgangskode. Prøv venligst igen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Flere muligheder?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrationsadgangskode"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Indtast en administrationsadgangskode, hvis du har brug for at udføre administrative opgaver.\nEllers vil det blive deaktiveret for at optimere sikkerheden."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Adgangskode:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificer adgangskode:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Adgangskoder er ikke ens</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adresse spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ved at ændre MAC-adressen skjules netværksenhedens serienummer for det lokale netværk. Dette kan hjælpe med at skjule din geografiske placering."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Det er generelt mere sikkert at ændre MAC-adresser, men det kan potentielt også virke mistænkeligt eller give problemer med forbindelsen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof alle MAC-adresser"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netværkskonfiguration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Denne computers internetforbindelse er fri for forhindringer. Du kan oprette forbindelse direkte til Tor-netværket."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Denne computers internetforbindelse er censureret, filtreret eller proxiet. Du skal konfigurere bro, firewall eller proxy indstillinger."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Deaktivér alt netværkskommunikation"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Sprog"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist fejlede med returkode %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup fejlede med return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist fejlede med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Anden..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/de/de.po b/de/de.po
index a81781f..70e3412 100644
--- a/de/de.po
+++ b/de/de.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -34,170 +34,290 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Weiter"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Anmelden"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Willkommen bei Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Beständige Speicherpartition benutzen?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.de.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nein"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Schreibgeschützt?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Falsche Passphrase. Bitte erneut versuchen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Weitere Optionen?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrationspasswort"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.de.html\">Dokumentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Geben Sie ein Administrationspasswort ein, falls Sie administrative Aufgaben durchführen wollen.\nAndernfalls wird diese Funktion zur Erhöhung der Sicherheit deaktiviert."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passwort:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Passwort erneut eingeben:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passwörter stimmen nicht überein</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Manipulation der MAC-Adresse"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden. Dies hilft dabei, Ihren geografischen Standort geheim zu halten."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Es ist grundsätzlich sicherer, MAC-Adressen zu manipulieren, aber es könnte auch Verdacht erregen oder Netzwerkverbindungsprobleme verursachen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Alle MAC-Adressen manipulieren"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netzwerkeinstellungen"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Die Internet-Verbindung dieses Rechners ist frei von Hindernissen. Es kann sich direkt mit dem Tor-Netzwerk verbunden werden."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Die Internet-Verbindung dieses Rechners ist zensiert, gefiltert oder vermittelt. Brücken-, Firewall- oder Vermittlungsserver-Einstellungen müssen getroffen werden."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Alle Netzwerkfunktionen deaktivieren"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Sprache"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ort"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Tastenbelegung"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Andere …"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/dz/dz.po b/dz/dz.po
index 4dadf08..e667edd 100644
--- a/dz/dz.po
+++ b/dz/dz.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Dzongkha (http://www.transifex.com/otf/torproject/language/dz/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: dz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/el/el.po b/el/el.po
index 56224c9..06b81c1 100644
--- a/el/el.po
+++ b/el/el.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-25 09:33+0000\n"
-"Last-Translator: anvo <fragos.george at hotmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,170 +25,290 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Εμπρός"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Είσοδος"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Καλωσήρθατε στο Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ενεργοποίηση persistence;"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Τεκμηρίωση</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ναι"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Όχι"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Συνθηματική Φράση:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Μόνο για Ανάγνωση;"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Λάθος συνθηματική φράση. Παρακαλώ δοκιμάστε ξανά.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Περισσότερες επιλογές;"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Κωδικός διαχείρισης"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Τεκμηρίωση</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Εισάγετε έναν κωδικό διαχείρισης σε περίπτωση που χρειαστείτε να πραγματοποιήσετε διαχειριστικές εργασίες. \nΕιδάλλως θα απενεργοποιηθεί για καλύτερη ασφάλεια."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Κωδικός:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Επαλήθευση Κωδικού:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Οι κωδικοί δεν ταιριάζουν</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Αλλοίωση διεύθυνσης MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Τεκμηρίωση</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Η πλαστογράφηση των διευθύνσεων MAC κρύβει τον σειριακό αριθμό των καρτών δικτύου σας για τα τοπικά δίκτυα. Αυτό μπορεί να σας βοηθήσει να κρύψετε τη γεωγραφική θέση σας."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Είναι γενικά ασφαλέστερο να πλαστογραφήσετε τις διευθύνσεις MAC, αλλά αυτό θα μπορούσε επίσης να αυξήσει την υποψία ή να προκαλέσει προβλήματα σύνδεσης με το δίκτυο."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Πλαστοράφηση όλων των διευθύνσεων MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Ρυθμίσεις δικτύου"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Τεκμηρίωση</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Η σύνδεση διαδικτύου αυτού του υπολογιστή δεν παρεμποδίζεται. Θα θέλατε να συνδεθείτε απ' ευθείας στο δίκτυο Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Η σύνδεση διαδικτύου αυτού του υπολογιστή λογοκρίνεται, φιλτράρεται ή περνάει από proxy. Πρέπει να ρυθμίσετε τις επιλογές για τις γέφυρες, το firewall ή το proxy. "
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Απενεργοποιήστε όλα τα δίκτυα"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Γλώσσα"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Τοποθεσία"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Διάταξη"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "Το live-persist απέτυχε με κωδικό επιστροφής %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Το cryptsetup απέτυχε με κωδικό επιστροφής %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Το live-persist απέτυχε με κωδικό επιστροφής %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Άλλα..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index f9f0d1c..b2a96ad 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Enter an administration password in case you need to perform administration tasks.\nOtherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verify Password:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing MAC addresses hides the serial number of your network cards to the local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "It is generally safer to spoof MAC addresses, but it might also raise suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "This computer's Internet connection is clear of obstacles. You would like to connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "This computer's Internet connection is censored, filtered, or proxied. You need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Disable all networking"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Other..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/eo/eo.po b/eo/eo.po
index 96bb033..4175406 100644
--- a/eo/eo.po
+++ b/eo/eo.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-01-23 16:59+0000\n"
-"Last-Translator: Arturo Crespo\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Antaŭe"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ensaluti"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bonvenon al Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ĉu uzi permanente?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentado</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Jes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Pasvorto:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Nurlege?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Malbona pasvorto. Provu denove.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Pliaj agordoj?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrada pasvorto"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentado</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Entajpu administradan pasvorton se vi bezonos fari administradajn aferojn.\nAlikaze ili estos malpermesitaj pro pli bona sekureco."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Pasvorto:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Kontroli pasvorton:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>La pasvortoj malsamas</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adresa mistifikado"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentado</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mistifikado de MAC-adresoj kaŝas serionumeron de via retkarto por lokaj retoj. Tio povas helpi kaŝi vian geografian lokon."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ĝenerale estas pli sekure mistifiki MAC-adresojn, sed tio povas ankaŭ pligrandigi suspekton aŭ kaŭzi problemojn kun retkonekto."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Mistifiki ĉiujn MAC-adresojn"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Reta agordo"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentado</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Interretkonekto de tiu ĉi komputolo estas senbariera. Vi povas konekti direkte al la Tor-reto."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Interretkonekto de tiu ĉi komputilo estas cenzurata, filtrata aŭ konektita per prokurilo. Vi bezonas agordi ponton, fajroŝirmilo aŭ agordoj por la prokurilo."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Malfunkciigi ĉiuj retoj"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Lingvo"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lingvo"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Aranĝo"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist paneis revenante kodon %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup paneis revenante kodon %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist paneis revenante kodon %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Aliaj..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/es/es.po b/es/es.po
index 9467a80..a21fab2 100644
--- a/es/es.po
+++ b/es/es.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-02-09 08:59+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,170 +26,290 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adelante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Entrar"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenido a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "¿Usar persistencia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.es.html\">Documentación</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Sí"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de contraseña:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "¿Sólo lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase de contraseña incorrecta. Por favor, inténtelo de nuevo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "¿Más opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Contraseña de administración"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.es.html\">Documentación</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introduzca la contraseña de administración en caso de que necesite realizar tareas de administración. \nDe otro modo se deshabilitará, para mayor seguridad."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contraseña:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifique la contraseña: "
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Las contraseñas no coinciden</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Falseamiento de la dirección MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.es.html\">Documentación</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "El falseamiento de la dirección MAC oculta el número de serie de sus tarjetas de red a las redes locales. Esto puede ayudarle a ocultar su ubicación geográfica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalmente es más seguro simular una dirección MAC, pero podría también aumentar las sospechas o causar problemas de conexión a la red."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Falsear todas las direcciones MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuración de red"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.es.html\">Documentación</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La conexión a Internet de esta computadora está libre de obstáculos. Puede que quiera conectar directamente a la red Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La conexión a Internet de esta computadora está censurada, filtrada, o proxyficada. Tendrá que configurar un repetidor puente ('bridge'), un cortafuegos ('firewall'), o las configuraciones para proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Desactivar todas las redes"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Localización"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Diseño"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist falló devolviendo el código %(returncode)s: %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup falló devolviendo el código %(returncode)s: \n%(stdout)s \n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist falló devolviendo el código %(returncode)s: \n%(stdout)s \n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Otro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index cb00fd4..7c5e495 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Pablo Di Noto <pdinoto at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Reenviar"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar sesión"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenido a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "¿Habilitar persistencia de datos?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de contraseña:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "¿Habilitar modo solo lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "Frase de contraseña incorrecta. Por favor intente nuevamente."
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mas opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Contraseña de administración"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentación</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introduzca una contraseña de administración por si acaso necesita realizar alguna tarea administrativa.\nSi no lo hace, el usuario administrador será deshabilitado para mayor seguridad."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contraseña:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar contraseña:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>La contraseña no concuerda</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ocultar la dirección MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "La opción de ocultar la dirección MAC utiliza una dirección alternativa para no revelar la dirección de fábrica de sus adaptadores de red. Esto puede evitar revelar su ubicación geográfica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "En general, es más seguro ocultar sus direcciones MAC, pero es posible que despierte sospechas o cause problemas de conexión en la red."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ocultar todas las direcciones MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuración de red"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Este computador esta conectado a Internet sin obstáculos Quizás quiera directamente a la red Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Este computador esta conectado a Internet utilizando un servicio que esta censurado, tiene filtros o un servidor proxy. Debe configurar un bridge, cortafuegos o proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Deshabilitar toda forma de conexión a redes"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ubicacion"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Distribución"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ha fallado con código de error %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ha fallado con código de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ha fallado con código de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Otro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/es_CL/es_CL.po b/es_CL/es_CL.po
index 6cba5f5..9a3500a 100644
--- a/es_CL/es_CL.po
+++ b/es_CL/es_CL.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/otf/torproject/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adelantar"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/es_CO/es_CO.po b/es_CO/es_CO.po
index 1c84d5a..3cc1a7c 100644
--- a/es_CO/es_CO.po
+++ b/es_CO/es_CO.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/otf/torproject/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: es_CO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Hacia adelante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar sesion"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po
index e68687a..ab242ea 100644
--- a/es_MX/es_MX.po
+++ b/es_MX/es_MX.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adelante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar Sesión"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenido a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utilizar Persistencia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Palabra clave:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Solo Lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Palabra clave incorrecta. Por favor intenta de nuevo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "¿Mas opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Password de Administrador"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentación</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ingrese una contraseña de administrador en caso de que necesites realizar tareas de administrador.\nEn caso contrario será desactivado por motivos de seguridad."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contraseña:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar Contraseña:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Las contraseñas no coinciden</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing MAC addresses oculta el numero de serie de tu tarjeta e red dentro de la red local. Esto te ayuda a ocultar tu ubicación geográfica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalmente es mas seguro el Spoof MAC addresses, pero también podría levantar sospechas o causar problemas de conexión de la red."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Husmear en todas las MAC addesses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuración de red"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La conexión a internet de esta computadora está libre de obstáculos. ¿Deseas conectarte directamente a la red de Tor?"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La conexión a intetnet de esta computadora está censurada, filtrada o pasa a través de un proxy. Es necesario configurar los ajustes del puente, cortafuegos o proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Desactivar toda actividad."
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "."
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Lenguaje"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lugar"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Diseño"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist falló regresando codigo de error %(returncode)s:%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup falló regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist falló regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Otro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/et/et.po b/et/et.po
index f207cb5..ed32bb7 100644
--- a/et/et.po
+++ b/et/et.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Jah"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/eu/eu.po b/eu/eu.po
index 6adf6aa..bdf8b67 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-30 17:26+0000\n"
-"Last-Translator: Iban\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Aurrera"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Saioa hasi"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ongi etorri Tailsera"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Iraunkortasuna erabili?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.eu.html\">Dokumentazioa</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Bai"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ez"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Pasahitza:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Irakurketa bakarrik?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Pasahitz okerra. Mesedez saiatu berriz</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Aukera gehiago?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Kudeaketa pasahitza"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentazioa</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Sartu kudeaketa pasahitza kudeaketa zereginak egin behar badituzu.\nBestela ezgaitu egingo da segurtasuna hobetzeko."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Pasahitza:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Pasahitza egiaztatu"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Pasahitzek ez dute bat egiten</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC helbidearen spoofing-a"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.eu.html\">Dokumentazioa</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC helbidea aldatzeak sare lokalan zure sare-txartelaren serie-zenbakia ezkutatzen du. Honek zure kokapen geografikoa eskutatzen lagundu diezazuke."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Oro har seguruagoa da MAC helbideak simulatzea, baina horrek ere susmoak eragin eta konexio arazoak sor ditzake sarearekin."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Faltsutu MAC helbide guztiak"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Sarearen konfigurazioa"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentazioa</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ordenagailu honen Internet-konexioa ez du oztoporik. Tor sarera zuzenean konektatzea gustatuko litzaizuke."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Ordenagailu honen Interneteko konexioa zentsuratuta, iragazita, edo proxyatuta dago."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Ezgaitu konexio guztiak"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Hizkuntza"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokala"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Diseinua"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist huts egin du %(returncode)s kodeekin:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup huts egin du %(returncode)s kodeekin:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist huts egin du %(returncode)s kodeekin:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Beste bat..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fa/fa.po b/fa/fa.po
index f2d59dd..a0f65c0 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-05-19 07:12+0000\n"
-"Last-Translator: Amir Moezzi <amirreza.mz at yahoo.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,170 +25,290 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "به سمت جلو"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ورود"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "به «تيلز» خوش آمديد"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "استفاده از ارتباط پایا؟"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">مستندات</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "بله"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "نه"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "رمز"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "فقط خواندن؟"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>رمز درست نیست. لطفاً دوباره سعیکنید.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "گزینههای بیشتر؟"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "رمز مديريت"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">مستندات</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "در صورتی که میخواهید کارهای مدیریتی انجام دهید، کلمهٔ عبور مدیریت را وارد نمایید.\nوگرنه، اين گزينه براى امنيت بيشتر غيرفعال مىشود."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "رمز عبور:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "تاييد رمز"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>رمزها با هم مطابقت ندارند</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "جعل آدرس MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">مستندات</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "جعل کردن آدرس مک، شماره سریال کارت شبکه شما را در شبکه مخفی می کند. به این ترتیب می توانید موقعیت جغرافیایی خود را پنهان کنید."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "بهطور کلی استفاده ازقابلیت MAC Spoofing امنتر است اما این امکان ممکن است مشکوک تلقی شود و یا باعث ایجاد مشکل در ارتباط گردد."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "همه آدرسهای MAC را جعل کن"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "تنظیمات شبکه"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">مستندات</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "اتصال اینترنت این رایانه بدون مانع است. آیا مایلید مستقیم به شبکه تور متصل شوید؟"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "اتصال اینترنت این رایانه سانسور و یا فیلتر شده است. شما باید تنظیمات پل، فایروال و یا پروکسی را انجام دهید."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "غیر فعال کردن همه شبکه ها"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr ""
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "زبان"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "محل"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "صفحهبندى"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ناموفق بود با کد خطای %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ناموفق بود با کد خطای %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ناموفق بود با کد خطای %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "دیگر..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fi/fi.po b/fi/fi.po
index 851f032..bfe31fa 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Jaakko Helleranta <jaakko at helleranta.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Eteenpäin"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Kirjaudu"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tervetuloa käyttämään Tailsia"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Säilytä muutokset?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ohjeet</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Kyllä"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Salalause:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Vain lukuoikeus?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Väärä salalause. Yritä uudelleen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Enemmän asetuksia?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Ylläpidon salasana"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ohjeet</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Valitse ylläpidon salasana siltä varalta, että joudut tekemään ylläpidollisia toimenpiteitä.\nMuutoin ylläpito estetään turvallisuussyistä."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Salasana:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Varmista salasana:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Salasanat eivät täsmää</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-osoitteen väärentäminen"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ohjeet</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Väärennetty MAC-osoite piilottaa verkkokorttisi sarjanumeron. Väärentäminen helpottaa maantieteellisen sijainnin piilottamista."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "MAC-osoitteen väärentäminen on yleensä turvallisempaa, mutta väärennetty osoite voi herättää huomiota tai aiheuttaa ongelmia verkkoyhteydessä."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Väärennä kaikki MAC-osoitteet"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Verkon asetukset"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ohjeet</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Tietokoneen Internet-yhteydessä ei ole esteitä. Voit yhdistää suoraan Tor-verkkoon."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Tietokoneen Internet-yhteyttä sensuroidaan, suodatetaan tai käytetään välityspalvelimen kautta. Sinun täytyy määrittää silta-, palomuuri- ja välityspalvelinasetukset."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Poista kaikki verkkoyhteydet käytöstä"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Kieli"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Maa-asetus"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Näppäinasettelu"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist epäonnistui paluuarvolla %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup epäonnistui paluuarvolla %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist epäonnistui paluuarvolla %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Muu..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fil/fil.po b/fil/fil.po
index c3c0a7a..8fbd2bd 100644
--- a/fil/fil.po
+++ b/fil/fil.po
@@ -8,180 +8,300 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Filipino (http://www.transifex.com/otf/torproject/language/fil/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fil\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n==2 || n==3) || (n % 10 != 4 || n % 10 != 6 || n % 10 != 9);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Sulong"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Maligayang pagsalubong sa Tails! "
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Gumamit ng persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
+
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Oo"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Wala"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/fo/fo.po b/fo/fo.po
index e7a962f..b2b7a05 100644
--- a/fo/fo.po
+++ b/fo/fo.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Faroese (http://www.transifex.com/otf/torproject/language/fo/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: fo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/fr/fr.po b/fr/fr.po
index 016f320..7ae615b 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -6,7 +6,7 @@
# Alex <chioubaca at gmail.com>, 2014
# apaddlingduck, 2014
# Emmanuel Simond <emmanuel.simond at gmail.com>, 2014
-# French language coordinator <french.translation at rbox.me>, 2016-2017
+# French language coordinator <french.coordinator at rbox.me>, 2016-2017
# matsa <matsa at riseup.net>, 2013
# Onizuka, 2013
# Sabrina Cater <sabcat at gmx.fr>, 2015
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-03-30 22:19+0000\n"
-"Last-Translator: French language coordinator <french.translation at rbox.me>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,170 +26,290 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avancer"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Connexion"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenue dans Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utiliser la persistance ?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Oui"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Phrase de passe :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Lecture-seule ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>La phrase de passe est erronée. Veuillez ressayer.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Plus d'options ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Mot de passe d'administration"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation (en anglais)</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Saisissez un mot de passe d'administration au cas où vous auriez besoin d'accomplir des tâches d'administration.\nAutrement, il sera désactivé pour une sécurité accrue."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Vérifier le mot de passe :"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Les mots de passe ne concordent pas</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Déguisement de l'adresse MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Le déguisement de l'adresse MAC dissimule le numéro de série de vos cartes réseau aux réseaux locaux. Cela peut vous aider à dissimuler votre position géographique."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Il est généralement plus sûr de déguiser les adresses MAC, mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Déguiser toutes les adresses MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuration du réseau"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connexion Internet de cet ordinateur est sans obstacle. Vous pouvez vous connecter directement au réseau Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relayée par un serveur mandataire. Vous devez configurer les paramètres de ponts (Bridges), pare-feu ou serveur mandataire."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Désactiver la connectivité réseau"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Langue"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Paramètres de langue"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disposition"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "Échec de live-persist avec le code de retour %(returncode)s :\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "échec de cryptsetup avec le code de retour %(returncode)s :\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Échec de live-persist avec le code de retour %(returncode)s :\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Autre..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po
index a316046..a2d2490 100644
--- a/fr_CA/fr_CA.po
+++ b/fr_CA/fr_CA.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# French language coordinator <french.translation at rbox.me>, 2016
+# French language coordinator <french.coordinator at rbox.me>, 2016
# matsa <matsa at riseup.net>, 2013
# Onizuka, 2013
-# French language coordinator <french.translation at rbox.me>, 2015-2016
-# French language coordinator <french.translation at rbox.me>, 2014
+# French language coordinator <french.coordinator at rbox.me>, 2015-2016
+# French language coordinator <french.coordinator at rbox.me>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-16 16:08+0000\n"
-"Last-Translator: French language coordinator <french.translation at rbox.me>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avancer"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Connexion"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenue à Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utiliser la persistance?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Oui"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Phrase de passe :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Lecture-seule?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>La phrase de passe est erronée. Veuillez ressayer.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Plus d'options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Mot de passe d'administration"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation (en anglais)</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Saisissez un mot de passe d'administration au cas où vous auriez besoin d'accomplir des tâches d'administration.\nAutrement, il sera désactivé pour une sécurité accrue."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Vérifier le mot de passe :"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Les mots de passe ne correspondent pas</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Déguisement de l'adresse MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Le déguisement de l'adresse MAC dissimule le numéro de série de vos cartes réseau aux réseaux locaux. Cela peut vous aider à dissimuler votre position géographique."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Il est généralement plus sécuritaire de déguiser les adresses MAC, mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Déguiser toutes les adresses MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuration du réseau"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connexion Internet de cet ordinateur est sans obstacle. Vous pouvez vous connecter directement au réseau Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relayée par un serveur mandataire. Vous devez configurer les paramètres de pont, pare-feu ou serveur mandataire."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Désactiver la connectivité réseau"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Langue"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Paramètres de langue"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disposition"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "Échec de live-persist avec le code de retour %(returncode)s :\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "échec de cryptsetup avec le code de retour %(returncode)s :\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Échec de live-persist avec le code de retour %(returncode)s :\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Autre..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fur/fur.po b/fur/fur.po
index 2e5461c..ff57c66 100644
--- a/fur/fur.po
+++ b/fur/fur.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Friulian (http://www.transifex.com/otf/torproject/language/fur/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: fur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/fy/fy.po b/fy/fy.po
index f0eb552..eeaeffa 100644
--- a/fy/fy.po
+++ b/fy/fy.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: fy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumintaasje</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Wachtwurd:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumintaasje</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Wachtwurd:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "Dokumintaasje"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "Dokumintaasje"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Taal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ga/ga.po b/ga/ga.po
index 97131d9..bc50ae6 100644
--- a/ga/ga.po
+++ b/ga/ga.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ga\n"
"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/gd/gd.po b/gd/gd.po
index 4ca3f22..40ba6fb 100644
--- a/gd/gd.po
+++ b/gd/gd.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2012-10-03 17:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: gd\n"
"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Chan eil"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/gl/gl.po b/gl/gl.po
index ad6e132..ff132b7 100644
--- a/gl/gl.po
+++ b/gl/gl.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Xan VFR\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adiante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Acceso"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Benvido/a a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usar persistencia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de paso:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Só lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Contrasinal incorrecto. Tenteo de novo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Máis opcións?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Contrasinal de administración"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentación</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introduza un contrasinal de administración para cando teña que realizar tarefas de administración.\nDe non facelo, para maior seguridade, desactivarase."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contrasinal:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar o contrasinal:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Os contrasinais non coinciden</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Spoofing de dirección MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Facendo spoofing da dirección MAC oculta o número de serie das súas tarxetas de rede ás redes locales. Isto pode axudar a ocultar a súa localización xeográfica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Xeralmente é máis seguro facer spoofing das direccións MAC, pero tamén pode levantar sospeitas ou causar problemas de conexión á rede."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Facer spoofing de tódalas direccións MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuración de rede"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentación</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A conexión á Internet deste computador está libre de obstáculos. Prestaríalle conectarse directamente á rede Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A conexión á Internet deste computador está censurada, filtrada ou pasa por un proxy. Necesita configurar os axustes de ponte, cortalumes ou proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Deshabilitar toda conexión á rede"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Deseño"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "produciuse un fallo coa persistencia en vivo devolvendo o código %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "produciuse un fallo na configuración de cifrado (cryptsetup) devolvendo o código %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "produciuse un fallo coa persistencia en vivo devolvendo o código %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Outro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/gu/gu.po b/gu/gu.po
index d9d180e..2193755 100644
--- a/gu/gu.po
+++ b/gu/gu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: gu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "આગળ"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/gu_IN/gu_IN.po b/gu_IN/gu_IN.po
index dc2ab04..ee1d3a0 100644
--- a/gu_IN/gu_IN.po
+++ b/gu_IN/gu_IN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gujarati (India) (http://www.transifex.com/otf/torproject/language/gu_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: gu_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/gun/gun.po b/gun/gun.po
index 10c19ea..b99f192 100644
--- a/gun/gun.po
+++ b/gun/gun.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gun (http://www.transifex.com/otf/torproject/language/gun/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: gun\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ha/ha.po b/ha/ha.po
index 41ea624..f92560c 100644
--- a/ha/ha.po
+++ b/ha/ha.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hausa (http://www.transifex.com/otf/torproject/language/ha/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ha\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/he/he.po b/he/he.po
index ada8c5d..93ca8f6 100644
--- a/he/he.po
+++ b/he/he.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: ION <bobiganush at yahoo.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,170 +25,290 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "קדימה"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "כניסה למערכת"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "ברוך בואך אל Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "השתמש בעקשנות?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">תיעוד</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "כן"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "לא"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "מימרת סיסמה:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "לקריאה בלבד?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>מימרת סיסמה שגוייה. אנא נסה שוב</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "יותר אפשרויות?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "סיסמת מנהל"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">תיעוד</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "הזן את סיסמא של ממשל במקרה שאתם צריכים לבצע משימות ניהול.\n אחרת זה יהיה מושבת לאבטחה טובה יותר."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "סיסמה:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "אימות סיסמה:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>סיסמאות אינו תואמות</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "זיוף כתובות Mac"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">תיעוד</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "טשטוש כתובות MAC מסווה את המספר הסידורי של כרטיס הרשת שלך מעיני הרשתות המקומיות אליהן הוא מתחבר. דבר זה עשוי לסייע בידך להסתיר את מיקומך הגיאוגרפי."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "ככלל, מומלץ לטשטש את כתובת ה-MAC שלך, אך זה גם עלול לעורר חשד או לשבש את החיבור לאינטרנט."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "זייף את כל כתובות ה-Mac"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "תצורת רשת"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">תיעוד</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "חיבור האינטרנט של מחשב זה פנוי ממכשולים, מסננים וחסימות. ברצונך לנסות להתחבר לאינטרנט ישירות באמצעות רשת Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "חיבור האינטרנט של מחשב זה מצונזר, מסונן או מוגבל. עליך לטפל בהגדרות פרוקסי, חומת אש או גשר."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "השבת את כל ההתחברויות לרשת"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "שפה"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "אזור"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "מערך"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "הפעלה חיה עקבית נכשלה עם השגיאה %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup נכשל עם הודעת השגיאה: %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "הפעלה חיה עקבית נכשלה עם השגיאה: %(returncode)s:\n%(stdout)s \n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "אחר..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/hi/hi.po b/hi/hi.po
index 678cbaf..c7c4f20 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "अग्रेषित"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "लॉग इन "
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "हाँ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "नहीं"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "भाषा"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/hr/hr.po b/hr/hr.po
index 2434fd4..948d248 100644
--- a/hr/hr.po
+++ b/hr/hr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprijed"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijavi se"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Više opcija?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrativna lozinka"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administrativnu lozinku u slučaju da trebate obaviti administrativne zadatke. Inače će biti onemogućena radi bolje sigurnosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdi lozinku"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Lozinke se ne poklapaju</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostalo..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 59c07fc..de73b4b 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-24 14:26+0200\n"
-"PO-Revision-Date: 2016-08-29 12:33+0000\n"
-"Last-Translator: Igor <lyricaltumor at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
"Language: hr_HR\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprijed"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Dobrodošli u Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Koristiti ustrajnost?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo čitanje?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Pogrešna lozinka. Molimo pokušajte ponovno.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Više mogućnosti?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administratorska lozinka"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administratorsku lozinku za slučaj da trebate izvoditi administratorske zadaće. One će u suprotnom biti onemogućene radi bolje sigurnosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdite lozinku:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Lozinke se ne podudaraju</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Maskiranje MAC adrese"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Maskiranje MAC adresa krije serijski broj Vaših mrežnih kartica od lokalnih mreža. Ovo Vam može pomoći sakriti Vaš zemljopisni položaj."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Općenito je sigurnije maskirati MAC adrese, ali to bi također moglo izazvati sumnju ili prouzročiti probleme mrežne veze."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Maskiraj sve MAC adrese"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Postavljanje mreže"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internet veza ovoga računala nema prepreka. Najbolje bi bilo spojiti se izravno u Tor mrežu."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internet veza ovoga računala je cenzurirana, filtrirana ili koristi proxy. Trebate podesiti mostovne, vatrozidne ili proxy postavke."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Onemogući sav mrežni rad"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Mjesto"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Raspored"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist nije uspio s povratnim kôdom %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup nije uspio s povratnim kôdom %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist nije uspio s povratnim kôdom %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostalo…"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ht/ht.po b/ht/ht.po
index e6f3733..ed7fa1c 100644
--- a/ht/ht.po
+++ b/ht/ht.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Haitian (Haitian Creole) (http://www.transifex.com/otf/torproject/language/ht/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ht\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/hu/hu.po b/hu/hu.po
index 7ab0a80..188770f 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -5,7 +5,7 @@
# Translators:
# benewfy <benewfy at gmail.com>, 2015
# Ferenc sati <s.feri33 at gmail.com>, 2015
-# Blackywantscookies <gaborcika at citromail.hu>, 2014
+# Blackywantscookies, 2014
# Lajos Pasztor <mrlajos at gmail.com>, 2014
# vargaviktor <viktor.varga at gmail.com>, 2013
# vargaviktor <viktor.varga at gmail.com>, 2012
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -23,170 +23,290 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Előre"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Belépés"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Köszöntjük a Tails-ben"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Perzisztencia használata?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentáció</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Igen"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nem"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Jelszó:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Csak olvasható?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Hibás jelszó. Próbálja meg újra.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "További beállítások?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Adminisztrátori jelszó"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentáció</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Adjon meg egy adminisztrátori jelszót az adminisztrációs feladatokhoz.\n\nEgyébként kikapcsolt, a magasabb biztonság érdekében."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Jelszó:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Jelszó ellenőrzése:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>A jelszavak nem egyeznek</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC cím elrejtése"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentáció</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC cím spoofing elrejti a hálózati kártyád széria számát a helyi hálózaton. Ez segít elrejteni a földrajzi helyzeted."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Általában biztonságos elrejteni a MAC címet de ez gyanút kelthet vagy hálózati kapcsolati problémákat okozhat."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Összes MAC cím elrejtése"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Hálózati konfiguráció"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentáció</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A számítógép internet kapcsolata akadályoktól mentes. Szeretnél közvetlenül kapcsolódni a Tor hálózathoz."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A számítógép internet kapcsolata cenzúrázott, szűrt vagy proxy-t használ. konfigurálnod kell a bridge, tűzfal vagy proxy beállításokat."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Összes hálózatépítés letiltása"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Nyelv"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ország"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Kiosztás"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Egyéb..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/hy/hy.po b/hy/hy.po
index 813976d..d05c774 100644
--- a/hy/hy.po
+++ b/hy/hy.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ia/ia.po b/ia/ia.po
index 278a330..8df45ae 100644
--- a/ia/ia.po
+++ b/ia/ia.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contrasigno:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Linguage"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/id/id.po b/id/id.po
index b7c19b5..e553eb5 100644
--- a/id/id.po
+++ b/id/id.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# adhisuryo <adhisuryo at gmail.com>, 2015
+# adhisuryo i <adhisuryo at gmail.com>, 2015
# Iwan Setiawan <stwn at duniasemu.org>, 2013
# Marg Situ <margyouversion at gmail.com>, 2014
-# Mohamad Hasan Al Banna <se7entime at protonmail.com>, 2013
+# Mohamad Hasan Al Banna <se7entime at openmailbox.org>, 2013
# km242saya <pencurimangga at gmail.com>, 2014
-# zk <zamani.karmana at gmail.com>, 2015
+# zk, 2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -23,170 +23,290 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Lanjutkan"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Masuk"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Selamat datang di Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Gunakan persistensi?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasi</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ya"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Tidak"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frasa sandi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Hanya-Baca?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frasa sandi salah. Mohon coba lagi.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Opsi lainnya?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Sandi administrasi"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentasi</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Masukkan sandi administrasi Anda jika Anda perlu menjalankan tugas administrasi.\nSelain itu akan dinonfungsikan untuk keamanan yang lebih baik."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Sandi:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifikasi Sandi:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Sandi tidak sama</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Pemalsuan alamat MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentasi</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Memalsukan alamat MAC menyembunyikan nomor serial kartu jaringan Anda ke jaringan lokal. Ini dapat membantu menyembunyikan lokasi geografis Anda."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Akan lebih aman untuk men-spoof alamat MAC, tapi hal ini dapat meningkatkan kecurigaan atau akan menjadi masalah pada sambungan jaringan."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof semua alamat MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfigurasi jaringan"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentasi</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Hubungan internet komputer ini bebas halangan. Anda dapat langsung berhubungan dengan jaringan Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Koneksi kekomputer ini tersensor, tersaring atau terproxy. anda perlu mengatur pengaturan bridge, firewall, atau pengaturan proxy"
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Nonaktifkan semua jaringan"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Bahasa"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Tata Letak"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist gagal dengan kode sebagai berikut %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Konfigrasi Crypt gagal dengan kode sebagai berikut %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist gagal dengan kode sebagai berikut %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Lainnya..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/is/is.po b/is/is.po
index 470655a..755afa5 100644
--- a/is/is.po
+++ b/is/is.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-27 13:43+0000\n"
-"Last-Translator: Sveinn í Felli <sv1 at fellsnet.is>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Áfram"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Innskráning"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkomin í Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Nota varanlega gagnageymslu?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Hjálparskjöl</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Já"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lykilfrasi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skrifvarið?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Rangur lykilfrasi. Reyndu aftur.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Fleiri möguleikar?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Lykilorð kerfisstjórnunar"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Hjálparskjöl</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Settu upp lykilorð fyrir kerfisstjórnun ef þú þarft að sýsla með kerfisstillingar.\nAnnars er lykilorð fyrir kerfisstjórnun haft óvirkt í öryggisskyni."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lykilorð:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Sannvotta lykilorð:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Lykilorðin stemma ekki</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Dulbúningur MAC-vistfangs"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Hjálparskjöl</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Dulbúningur MAC-vistfangs felur raðnúmer netkortsins fyrir staðarnetinu. Það getur hjálpað til við að fela staðsetningu þína."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Dulbúningur MAC-vistfangs er almennt öruggara, en það getur aftur valdið vandamálum í tengingum eða litið grunsamlega út."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Dulbúa öll MAC-vistföng"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Stillingar netkerfis"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Hjálparskjöl</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internet-tenging þessarar tölvu er án hindrana. Þú getur tengst Tor-netinu beint."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internet-tenging þessarar tölvu er ritskoðuð, síuð eða beint í gegnum milliþjón. Þú ættir að stilla uppsetningu fyrir brýr, eldvegg eða milliþjón."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Afvirkja alla netvinnslu"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Tungumál"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Staðfærsla"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Framsetning"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist mistókst með svarkóða %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup mistókst með svarkóða %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist mistókst með svarkóða %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Annað..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/it/it.po b/it/it.po
index ed348f3..ac85846 100644
--- a/it/it.po
+++ b/it/it.po
@@ -5,18 +5,18 @@
# Translators:
# Fandor, 2013
# Fandor, 2013
-# il_doc <filippo.giomi at gmail.com>, 2014
+# il_doc, 2014
# Francesca Ciceri <madamezou at zouish.org>, 2014
# spawned76 <fswitch20 at hotmail.com>, 2012
-# il_doc <filippo.giomi at gmail.com>, 2014
+# il_doc, 2014
# Random_R, 2014-2015
# spawned76 <fswitch20 at hotmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -25,170 +25,290 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avanti"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Accesso"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Benvenuti in Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utilizzare la persistenza?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.it.html\">Documentazione</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Sì"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase segreta:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Sola lettura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase segreta sbagliata. Provare di nuovo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Altre opzioni?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Password di amministrazione"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.it.html\">Documentazione</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Inserire una password di amministrazione in caso si debbano eseguire delle attività di amministrazione. In caso contrario la password di amministrazione sarà disabilitata per migliorare la sicurezza."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifica password:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Le password non corrispondono</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Offuscamento dell'indirizzo MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.it.html\">Documentazione</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Offuscare l'indirizzo MAC significa nascondere il numero seriale della propria scheda di rete alle reti locali. Questo permette di non rendere nota la propria posizione geografica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalmente è più sicuro oscurare l'indirizzo MAC, ma può generare sospetti o causare problemi di connessione."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Offusca tutti gli indirizzi MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configurazioni di rete"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.it.html\">Documentazione</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connessione a Internet di questo computer non è bloccata in alcun modo. Volendo puoi connetterti direttamente alla rete Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connessione a Internet di questo computer è bloccata da censura, filtrata o utilizza un proxy. È necessario configurare un bridge, firewall o un proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Disattiva tutta la rete"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Lingua"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Impostazioni internazionali"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disposizione"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ha fallito con return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ha fallito con return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ha fallito con return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Altro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ja/ja.po b/ja/ja.po
index 9b3a3f9..bfc4757 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
"MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "進む"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ログイン"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tailsへようこそ"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "永続性を使用しますか？"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ドキュメント</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "はい"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "いいえ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "パスフレーズ:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "読み取り専用ですか？"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>パスフレーズが間違っています。やり直してください。</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "その他のオプション？"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "管理者パスワード"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">ドキュメント</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "管理者のタスクを実行する必要がある場合、管理者パスワードを入力してください。\nでなければ、セキュリティ向上のために無効になります。"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "パスワード:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "パスワード確認:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>パスワードが一致しません</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC アドレススの成りすまし"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ドキュメント</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC アドレスをスプーフィングすると、ローカルネットワークにネットワークカードのシリアルナンバーを隠蔽します。これは地理的情報の隠蔽に役立ちます。"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "普通は MAC アドレスをスプーフィングするほうが安全ですが、疑いをもたらしたり、ネットワーク接続の問題を引き起こす場合もあります。"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "すべての MAC アドレスを成りすましする"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ネットワーク設定"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">ドキュメント</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "このコンピューターのインターネット接続には障害がありません。 Tor ネットワークに直接接続します。"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "このコンピューターのインターネット接続は検閲されているか、フィルターされているか、プロキシを通します。ブリッジないしファイアーウォール、プロキシ設定を構成する必要があります。"
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "ネットワーク能力を全て無効化"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "言語"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "地域"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "レイアウト"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persistが失敗しました。再開コードは %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup が失敗しました。再開コードは %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persistが失敗しました。再開コードは %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "その他..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/jv/jv.po b/jv/jv.po
index cab1906..288e9ce 100644
--- a/jv/jv.po
+++ b/jv/jv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Javanese (http://www.transifex.com/otf/torproject/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: jv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ka/ka.po b/ka/ka.po
index 66dd6c6..eaf2307 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Kristina Tyskiewicz <savannah5k at yahoo.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "შესვლა"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "კეთილი იყოს თქვენი მობრძანება Tails-ში"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "დიახ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "არა"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "პაროლი:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "პაროლი არასწორია. გთხოვთ კიდევ სცადეთ."
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ადმინისტრატორის პაროლი"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "პაროლი:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "დაადასტურეთ პაროლი:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "პაროლები არ ემთხვევა"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "ენა"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "განლაგება"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "სხვა..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/kk/kk.po b/kk/kk.po
index a97c552..5c68297 100644
--- a/kk/kk.po
+++ b/kk/kk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: kk\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Жоқ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/km/km.po b/km/km.po
index 47abab9..a99b251 100644
--- a/km/km.po
+++ b/km/km.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-08-25 03:48+0000\n"
-"Last-Translator: Sokhem Khoem <sokhem at open.org.kh>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "បញ្ជូនបន្ត"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ចូល"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "ស្វាគមន៍មកកាន់ Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ប្រើ persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ឯកសារ</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "បាទ/ចាស"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ទេ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "ឃ្លាសម្ងាត់៖"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "បានតែអាន?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ឃ្លាសម្ងាត់ខុស។ សូមព្យាយាមម្ដងទៀត។</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ជម្រើសច្រើន?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ពាក្យសម្ងាត់សម្រាប់ការគ្រប់គ្រង"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">ឯកសារ</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "បញ្ចូលពាក្យសម្ងាត់សម្រាប់ការគ្រប់គ្រងក្នុងករណីដែលអ្នកត្រូវការភារកិច្ចសម្រាប់ការគ្រប់គ្រង។\nម៉្យាងវិញទៀតវានឹងត្រូវបានបិទដើម្បីសុវត្ថិភាពឲ្យកាន់តែប្រសើរ។"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ពាក្យសម្ងាត់៖"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ផ្ទៀងផ្ទាត់ពាក្យសម្ងាត់៖"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>ពាក្យសម្ងាត់មិនផ្គូផ្គង</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "បញ្ឆោតអាសយដ្ឋាន MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ឯកសារ</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "ការបញ្ឆោតអាសយដ្ឋាន MAC លាក់លេខស៊េរីកាតបណ្ដាញរបស់អ្នកចំពោះបណ្ដាញមូលដ្ឋាន។ វាអាចជួយអ្នកលាក់ទីតាំងភូមិសាស្ត្ររបស់អ្នក។"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "ជាទូទៅវាកាន់តែមានសុវត្ថិភាពដើម្បីបញ្ឆោតអាសយដ្ឋាន MAC ប៉ុន្តែវាក៏អាចបង្កើនការសង្ស័យ ឬធ្វើឲ្យការភ្ជាប់បណ្ដាញមានបញ្ហា។"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "បញ្ឆោតអាសយដ្ឋាន MAC ទាំងអស់"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ការកំណត់រចនាសម្ព័ន្ធបណ្ដាញ"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">ឯកសារ</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "ការភ្ជាប់អ៊ីនធឺណិតកុំព្យូទ័រនេះគ្មានបញ្ហាទេ។ អ្នកចង់ភ្ជាប់ដោយផ្ទាល់ទៅបណ្ដាញ Tor ។"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "ការភ្ជាប់អ៊ីនធឺណិតកុំព្យូទ័រនេះត្រូវបានពិនិត្យ ច្រោះ ឬកំណត់ប្រូកស៊ី។ អ្នកត្រូវកំណត់រចនាសម្ព័ន្ធប៊្រីត ជញ្ជាំងភ្លើង ឬការកំណត់ប្រូកស៊ី។"
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "បិទការភ្ជាប់បណ្ដាញទាំងអស់"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "ភាសា"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "ទីតាំង"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ប្លង់"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "បានបរាជ័យ live-persist ជាមួយ return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "បានបរាជ័យ cryptsetup ជាមួយ return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "បានបរាជ័យ live-persist ជាមួយ return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "ផ្សេងទៀត..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/kn/kn.po b/kn/kn.po
index 6922573..490d031 100644
--- a/kn/kn.po
+++ b/kn/kn.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ಮುಂದೆ"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ಪ್ರವೇಶ"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "ಟೇಲ್ಸ್ಗೆ ಸ್ವಾಗತ"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ಅವಧಿ ನಂತರ ಉಳಿಕೆಗೆ ಒಪ್ಪಿಗೆಯೇ?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ಓಕೇ"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ಇಲ್ಲ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "ಕೊಂಡಿಪದ"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "ಓದೋದಕ್ಕೆ ಮಾತ್ರ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ತಪ್ಪು ಗುಪ್ತಪದ. ಇನ್ನೊಂದ್ ಸಲ ಟ್ರೈ ಮಾಡಿ.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ಹೆಚ್ಚಿನ ಆಯ್ಕೆಗಳು ಬೇಕಾ?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ಆಡಳಿತದ ಗುಪ್ತಪದ"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr " ಆಡಳಿತದ ಕ್ರಿಯೆಗಳನ್ನ ಮಾಡ್ಲಿಕ್ಕೆ ಆಡಳಿತದ ಗುಪ್ತಪದ ಒತ್ತಿರಿ.⏎\nಇಲ್ಲಾಂದ್ರೆ, ಆಡಳಿತದ ಗುಪ್ತಪದವನ್ನ ಅನೂರ್ಜಿತವಾಗಿಸೋಣ."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ಗುಪ್ತಪದ:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ಗುಪ್ತಪದ ದೃಢಪಡಿಸಿ:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>ಗುಪ್ತಪದ ತಾಳೆಯಾಗ್ತಿಲ್ಲ<i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "ಭಾಷೆ"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "ಪ್ರಾದೇಶಿಕತೆ"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ರೂಪ"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "ಲೈವ್-ಪರ್ಸಿಸ್ಟ್ (ಮಾಹಿತಿಯನ್ನ ದೀರ್ಘಕಾಲ ಕಾಪಾಡೋದು) ಈ ರಿಟರ್ನ್ ಕೋಡ್ (ಫಲಿತಾಂಶ) ನೀಡಿ ಫ಼ೇಲಾಯ್ತು, %(returncode)s:⏎\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "ಕ್ರಿಪ್ಟ್-ಸೆಟಪ್ ಅಥವಾ ರಹಸ್ಯವಾಗಿರಿಸೋ ವ್ಯವಸ್ಥೆ ಈ ರಿಟರ್ನ್ ಕೋಡ್ ಅಂದ್ರೆ ಫಲಿತಾಂಶ ನೀಡಿ ಫ಼ೇಲಾಯ್ತು, %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "ಲೈವ್-ಪರ್ಸಿಸ್ಟ್ (ಮಾಹಿತಿಯನ್ನ ದೀರ್ಘಕಾಲ ಕಾಪಾಡೋದು) ಈ ರಿಟರ್ನ್ ಕೋಡ್ (ಫಲಿತಾಂಶ) ನೀಡಿ ಫ಼ೇಲಾಯ್ತು,%(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "ಬೇರೆ..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ko/ko.po b/ko/ko.po
index f59dd98..2f0fcc0 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# stevegrey <91.ragi at gmail.com>, 2014
+# stevegrey <inactive+stevegrey at transifex.com>, 2014
# ilbe123 <a3057016 at drdrb.net>, 2014
# Jamin <bakzaa at gmail.com>, 2014
# Dr.what <javrick6 at naver.com>, 2014-2015
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Dr.what <javrick6 at naver.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,170 +21,290 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "앞으로"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "로그인"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tails에 오신 것을 환영합니다!"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "영구성 사용 하시겠습니까?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">문서</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "예"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "아니오"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "암호 :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "읽기 전용으로 하시겠습니까?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>암호가 잘못되었습니다. 다시 시도하십시오.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "상세한 옵션?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "관리 암호"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">문서</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "관리자 작업을 수행해야하는 경우 관리자 암호를 입력하십시오.\n아니면 보안 향상을 위해 사용할 수 없습니다."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "암호 : "
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "암호 확인 : "
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>비밀번호가 일치하지 않습니다.</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC 주소 위장"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">문서</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC 주소를 위장하여 로컬 네트워크에 네트워크 카드의 일련 번호를 은폐합니다. 이것은 지리적 정보의 은폐에 도움이 됩니다."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "일반적으로 MAC 주소를 위장하는 것이 안전하지만, 의심을 불러일으키거나 네트워크 연결 문제를 일으키는 경우도 있습니다."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "모든 MAC 주소를 위장하기"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "네크워크 구성"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">문서</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "이 컴퓨터의 인터넷 연결에는 문제가 없습니다. Tor 네트워크에 직접 연결합니다."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "이 컴퓨터의 인터넷 연결은 검열되어 있거나 필터링되어 있는 프록시를 통합니다. 브리지 내지는 방화벽, 프록시 설정을 구성해야합니다."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr " 네트워크 연결을 비활성화"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr ". "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "언어"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "지역"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "레이아웃"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist가 실패했습니다. 반환 코드는 %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup이 실패했습니다. 반환 코드는 %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist가 실패했습니다. 반환 코드는 %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "기타..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ko_KR/ko_KR.po b/ko_KR/ko_KR.po
index 6f8da56..0081fde 100644
--- a/ko_KR/ko_KR.po
+++ b/ko_KR/ko_KR.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Korean (Korea) (http://www.transifex.com/otf/torproject/language/ko_KR/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: ko_KR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "앞으로"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "로그인"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "테일즈에 오신 것을 환영합니다"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "예"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "아니오"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "비밀번호:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "읽기 전용?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>비밀번호가 틀렸습니다. 다시 입력해 주십시오.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "상세 설정?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "관리자 비밀번호"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "관리자 권한이 필요한 작업을 하는 경우 관리자 비밀번호를 입력해주세요. \n입력하지 않을 경우 보안 문제로 관리자 권한을 얻을 수 없습니다."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "비밀번호:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "비밀번호 확인:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>비밀번호가 일치하지 않습니다.</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC 주소 스푸핑"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC 주소를 스푸핑 할 경우 네트워크 카드의 일련번호를 인터넷 상에서 숨길 수 있습니다. 이 경우 컴퓨터의 위치를 숨길 수 있습니다."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "보통 스푸핑을 하는 것이 안전하나, 의심을 받을 수 있고 네트워크 연결이 불안정할 수 있습니다."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "MAC 주소 스푸핑 하기"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "네트워크 설정"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "이 컴퓨터는 인터넷에 연결되는 데 지장이 없습니다. 컴퓨터를 바로 토르 네트워크와 연결하고 싶습니다."
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "이 컴퓨터의 인터넷 연결은 검열되거나, 필터링 되거나, 프록시에 연결되어 있습니다. 브릿지, 방화벽, 혹은 프록시 설정이 필요합니다."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "언어"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "레이아웃"
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "기타..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ku/ku.po b/ku/ku.po
index d5e3b4e..7071c9b 100644
--- a/ku/ku.po
+++ b/ku/ku.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kurdish (http://www.transifex.com/otf/torproject/language/ku/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ku\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ku_IQ/ku_IQ.po b/ku_IQ/ku_IQ.po
index 4b64b0f..97fa9b7 100644
--- a/ku_IQ/ku_IQ.po
+++ b/ku_IQ/ku_IQ.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-09-16 20:19+0000\n"
-"Last-Translator: Rasti K5 <rasti.khdhr at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/otf/torproject/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "بەڵی"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "نەخێر"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "بژاردەی زیاتر؟"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "تێپەڕەوشە:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "زمان"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "هی تر..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/kw/kw.po b/kw/kw.po
index 6e6251d..04739c6 100644
--- a/kw/kw.po
+++ b/kw/kw.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Cornish (http://www.transifex.com/otf/torproject/language/kw/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: kw\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ky/ky.po b/ky/ky.po
index 1ad2e2b..f33d2ed 100644
--- a/ky/ky.po
+++ b/ky/ky.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kyrgyz (http://www.transifex.com/otf/torproject/language/ky/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ky\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Сырсөз:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/la/la.po b/la/la.po
index 8df09c1..8124175 100644
--- a/la/la.po
+++ b/la/la.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-09-24 12:18+0000\n"
-"Last-Translator: Alisa P <parashchenko.alisa at yandex.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: la\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "In frontem"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Inire"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Salve in Caudis"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usarene persistentiam?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentatio</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Est"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Sententia transilindi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Legerene tantum="
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Sententia transilindi falsa. Proba iterum.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Magis possibilitatum?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Verbum transilindi imperii"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentatio</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Inda verbum transilindi imperii, si negotia imperii facere debest.\nNisi, deest pro certitudine maiore."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Verbum transilindi"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verbum transilindi probare:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Verba transilini aequala non sunt</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Falsificatio sententiae MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentatio</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Falsificatio sententiarum MAC numerum versionis apparatus coniunctionis tui ad coniunctiones in loco. Id locum geographicum tuum latere adest."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Saepe certior est MAC sententias falsificere, sed etiam suspicionem aut problemata coniunctionis coniunctione facere potest."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Omnes sententias MAC falsificere"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuratio coniunctionis"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentatio</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Coniunctio coniunctione computatorum computatoris sine problemata est. Ad Tor coniunctionem lineare coniungere vis."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Coniunctio coniunctionis computatorum ei computatoris mutata aut clausa est. Pontem aut murum ignis aut clavem configurare debes."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Omnes coniunctiones defacere"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "_"
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Lingua"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Transferatio"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Modus ostendationis"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist non fecit, resultatum est %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "crypt-setup non fecit, resultatum est %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist non fecit, resultatum est %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Alia..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/lb/lb.po b/lb/lb.po
index aa02497..3138a8c 100644
--- a/lb/lb.po
+++ b/lb/lb.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Tyler Durden <virii at enn.lu>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Virun"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Aloggen"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Wëllkomm bei Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Eng bestänneg Späicherpartitioun benotzen?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentatioun</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Jo"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passwuert:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Schreiwgeschützt?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Falscht Passwuert. Probéiert nach eng kéier.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Méi Optiounen?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administratiounspasswuert"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentatioun</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Gitt een Administratiounspasswuert an, falls der Administratiounsaufgaben hutt.\nSoss gëtt des Funktioun aus Sécherheetsgrënn ofgeschalt."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passwuert:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Passwuert bestätegen:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passwierder passen net</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC Adress Manipulatioun"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentatioun</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC Adress Manipulatioun kann d'Serienummer vun der eegener Netzwierkkaart am lokale Netz verschleieren. Dat kann iech hëllefen ären Standuert geheim ze halen."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Et ass generell méi sécher seng MAC Adressen ze manipuléieren mä et kann och opfalen oder Problemer mat der Verbindung zum Netzwierk verursaachen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "All MAC Adressen manipuléieren"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netzwierkastellungen"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentatioun</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Verbindung zum Internet vun dësem Computer ass Hëndernësfräi. Dir wëllt iech direkt an Tor Netzwierk verbannen."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Verbindung zum Internet vun dësem Computer ass zenséiert, gefiltert oder muss duerch e Proxy. Dir musst ee Brécke-Server, är Firewall oder är Proxy Astellungen kucken."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "All Netzwierkfunktiounen desaktivéieren"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Sprooch"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Uert"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist huet e Feeler erëm ginn mam Code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup huet e Feeler erëm ginn mam Code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist huet e Feeler erëm ginn mam Code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Anerer"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/lg/lg.po b/lg/lg.po
index 00f6c1c..23a901b 100644
--- a/lg/lg.po
+++ b/lg/lg.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Ganda (http://www.transifex.com/otf/torproject/language/lg/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: lg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ln/ln.po b/ln/ln.po
index 7414a4a..998979b 100644
--- a/ln/ln.po
+++ b/ln/ln.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Lingala (http://www.transifex.com/otf/torproject/language/ln/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ln\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/lo/lo.po b/lo/lo.po
index 4e5ad23..53afa8b 100644
--- a/lo/lo.po
+++ b/lo/lo.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Lao (http://www.transifex.com/otf/torproject/language/lo/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: lo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ສົ່ງຕໍ່"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ລົງຊື່ເຂົ້າໃຊ້"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ແມ່ນ"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ບໍ່"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/lt/lt.po b/lt/lt.po
index c3c1c6f..b3fa0d5 100644
--- a/lt/lt.po
+++ b/lt/lt.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-23 22:46+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
"Language: lt\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Pirmyn"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prisijungti"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Sveiki atvykę į Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Naudoti ilgalaikį kaupiklį?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Taip"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Slaptafrazė:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Tik skaitymui?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Bloga slaptafrazė. Prašome pamėginti dar kartą.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Daugiau parametrų?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administravimo slaptažodis"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Jeigu norėsite atlikti administravimo užduotis, įrašykite administravimo slaptažodį.\nPriešingu atveju, saugumo sumetimais jis bus išjungtas. "
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Slaptažodis:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Pakartokite slaptažodį:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Slaptažodžiai nesutampa</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adresų klastojimas"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adresų klastojimas nuslepia jūsų tinklo plokštės serijos numerį vietiniuose tinkluose. Tai padeda nuslėpti jūsų geografinę padėtį. "
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Paprastai yra saugiau klastoti MAC adresus, tačiau tai gali taip pat sukelti įtarimą arba susijungimo su tinklu problemas."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Klastoti visus MAC adresus"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Tinklo konfigūravimas"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Šio kompiuterio interneto ryšys yra be kliūčių. Jūs norėtumėte prisijungti tiesiogiai prie Tor tinklo."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Šio kompiuterio interneto ryšys yra cenzūruojamas, filtruojamas arba jungiamas per įgaliotąjį serverį. Jums reikia sukonfigūruoti tinklų tiltą, užkardą ar įgaliotojo serverio nustatymus."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Išjungti visą darbą tinkle"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Kalba"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokalė"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Išdėstymas"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist nepavyko, grąžindama kodą %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup nepavyko, grąžindama kodą %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist nepavyko, grąžindama kodą %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Kita..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/lv/lv.po b/lv/lv.po
index 1f1021b..8f0db7d 100644
--- a/lv/lv.po
+++ b/lv/lv.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Ojārs Balcers <ojars.balcers at gmail.com>, 2012
-# Ojārs Balcers <ojars.balcers at gmail.com>, 2013-2015
+# Ojars Balcers <ojars.balcers at gmail.com>, 2012
+# Ojars Balcers <ojars.balcers at gmail.com>, 2013-2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Pārsūtīt"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Pieteikšanās"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Sveicināti Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Vai lietot pastāvību?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentācija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Jā"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nē"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ieejas frāze:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Tikai-lasāms?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Aplama ieejas frāze. Lūdzu mēģiniet vēlreiz.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Vairāk iespēju?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrēšanas parole"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentācija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ja Jūsu pienākumos ietilpst veikt administrēšanas pienākumus, ievadiet administrēšanas paroli.\nParoli neievadot, lielākas drošības dēļ, to atspējos."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Parole:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificēt paroli:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Paroles nesakrīt</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adreses maldinoša maiņa"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentācija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adreses maldinoša maiņa jeb spūfings slēpj vietējiem tīkliem Jūsu tīkla kartes seriālo numuru. Tas ir noderīgi, lai slēptu Jūsu ģeogrāfiskās atrašanās vietu."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Vispārīgā gadījumā ir drošāk maldinoši norādīt MAC adreses, bet tas var radīt aizdomas vai izraisīt tīkla savienojuma problēmas."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Maldinoši norādīt visas MAC adreses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Tīkla konfigurēšana"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentācija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Šī datora interneta savienojumam nav šķēršļu. Vēlaties veidot tiešu savienojumu ar tīklu Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Jūsu datora savienojums ar internetu ir cenzēts, filtrēts vai starpniekots. Jums jākonfigurē tiltu, ugunsmūru vai starpniekserveru iestatījumi."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Atspējot jebkādu tīklošanu"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Valoda"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokalizācija"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Izkārtojums"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist nesekmīgs, norādītais kods %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup nesekmīgs, norādītais kods %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist nesekmīgs, norādītais kods %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Cits..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/mg/mg.po b/mg/mg.po
index 898c3e9..d9512f7 100644
--- a/mg/mg.po
+++ b/mg/mg.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Malagasy (http://www.transifex.com/otf/torproject/language/mg/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: mg\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/mi/mi.po b/mi/mi.po
index f038285..346d2d9 100644
--- a/mi/mi.po
+++ b/mi/mi.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Maori (http://www.transifex.com/otf/torproject/language/mi/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: mi\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/mk/mk.po b/mk/mk.po
index 80141f4..2139698 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ml/ml.po b/ml/ml.po
index fe325f4..6f05cef 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/mn/mn.po b/mn/mn.po
index 902bc55..6ba3a89 100644
--- a/mn/mn.po
+++ b/mn/mn.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Mongolian (http://www.transifex.com/otf/torproject/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/mr/mr.po b/mr/mr.po
index 511a523..4884724 100644
--- a/mr/mr.po
+++ b/mr/mr.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Vikrant Korde <vikrant.korde at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: mr\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "फॉरवर्ड"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "होय"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "नाही"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po
index c55a255..a4579c3 100644
--- a/ms_MY/ms_MY.po
+++ b/ms_MY/ms_MY.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ke hadapan"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Log Masuk"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Selamat datang ke Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Gunakan persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ya"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Tidak"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frasa laluan:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Baca Sahaja?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Salah frasa laluan. Sila cuba sekali lagi.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Lebih banyak tetapan?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Kata laluan pentadir"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Masukkan kata laluan pentadbir dalam kes anda perlu untuk melaksanakan tugas-tugas pentadbiran.\nJika tidak, ia akan dimatikan untuk keselamatan yang lebih baik."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Kata laluan:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Sahkan Kata Laluan:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Kata laluan tidak sepadan</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Bahasa"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Lain..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/mt/mt.po b/mt/mt.po
index d325d60..d2455f3 100644
--- a/mt/mt.po
+++ b/mt/mt.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Maltese (http://www.transifex.com/otf/torproject/language/mt/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: mt\n"
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/my/my.po b/my/my.po
index b376bd3..9324de1 100644
--- a/my/my.po
+++ b/my/my.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: my\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "အရှေ့သို့"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ဟုတ်ကဲ့"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "လက်မခံ့ါ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "စကားဝှက် - "
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "ဘာသာစကား"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/nah/nah.po b/nah/nah.po
index 853eea1..001b927 100644
--- a/nah/nah.po
+++ b/nah/nah.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Nahuatl (http://www.transifex.com/otf/torproject/language/nah/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: nah\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/nap/nap.po b/nap/nap.po
index 7442dac..839acc8 100644
--- a/nap/nap.po
+++ b/nap/nap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Neapolitan (http://www.transifex.com/otf/torproject/language/nap/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: nap\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/nb/nb.po b/nb/nb.po
index 7e9dcc0..c7b27b0 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-17 02:03+0000\n"
-"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Fremover"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Innlogging"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkommen til Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Bruk vedvarende lagring?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passordsekvens:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skrivebeskyttet?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Feil passord. Prøv igjen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Flere alternativ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administratorpassord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentasjon</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Skriv inn administrasjonspassord i tilfelle du trenger å utføre administratoroppgaver.\nHvis ikke vil dette bli avskrudd for bedret sikkerhet."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Bekreft passord:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passordene samsvarer ikke</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adressesimulering"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Simulering av MAC-adresser skjuler nettverkskortets serienummer på lokale nettverk. Dette kan bidra til å skjule din geografiske plassering."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Det er generelt tryggere å simulere MAC-adresser, men det kan også vekke mistanke eller forårsake problemer med nettverkstilkoblingen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Simuler alle MAC-adresser"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Nettverksoppsett"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Denne datamaskinens internettforbindelse er uten hindringer. Du ønsker å koble direkte til Tor-nettverket."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Denne datamaskinens internettforbindelse er sensurert, filtrert eller går via en mellomtjener. Du må sette opp bro, brannmur, eller proxy-innstillinger. "
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Skru av all nettverkstilknytning"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Språk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Land"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Oppsett"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist feilet med returkode %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Annet…"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nds/nds.po b/nds/nds.po
index b901689..4fb4a3b 100644
--- a/nds/nds.po
+++ b/nds/nds.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Low German (http://www.transifex.com/otf/torproject/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ne/ne.po b/ne/ne.po
index be93fa7..0c0dcdd 100644
--- a/ne/ne.po
+++ b/ne/ne.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/nl/nl.po b/nl/nl.po
index cbff823..359f4b9 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Cleveridge <erwin.de.laat at cleveridge.org>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Doorgaan"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welkom bij Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Persistentie gebruiken?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "Documentatie"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Wachtzin:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Verkeerd wachtwoord. Probeer opnieuw.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Meer opties?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Beheerderswachtwoord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "Documentatie"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Voer een beheerderswachtwoord in wanneer je beheerstaken moet kunnen uitvoeren.\nNiets ingevuld zal beheer worden uitgeschakeld voor betere veiligheid."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Wachtwoord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Wachtwoord verifiëren:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Wachtwoorden zijn niet gelijk</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adres spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "Documentatie"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adres spoofing verbergt het serienummer van je netwerkkaart op lokale netwerken. Dit kan helpen bij het verbergen van je geografische locatie."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Het is over het algemeen veiliger om MAC adressen te spoofen, het kan echter ook argwaan opwekken of verbindingsproblemen veroorzaken. Zie documentatie."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Alle MAC adressen spoofen"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netwerkconfiguratie"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "Documentatie"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "De internetverbinding van deze computer is vrij van obstakels. U wilt direct met het Tor netwerk verbinden."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "De internetverbinding van deze computer is gecensureerd, gefiltered of loopt via een proxy. U dient de bridge, firewall of proxy instellingen te configureren."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Alle netwerken uitschakelen"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Taal"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist lukte niet, return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup lukte niet, return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist lukte niet, return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Anders..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po
index 7c29faa..25349ad 100644
--- a/nl_BE/nl_BE.po
+++ b/nl_BE/nl_BE.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: nl_BE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Verder"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Aanmelden"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welkom bij Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Persistence gebruiken?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentatie</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Verkeerde passphrase. Probeer opnieuw aub.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Meer opties?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Beheerderswachtwoord"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentatie</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Voer een beheerderswachtwoord in voor het geval u beheerderstaken dient uit te voeren.\nAnders zal dit onbruikbaar gemaakt worden voor betere beveiligingsdoeleinden."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Wachtwoord:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Wachtwoord Verifiëren:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Wachtwoorden komen niet overeen</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adres spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentatie</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mac-adres spoofing verbergt het serienummer van uw netwerkkaart voor lokale netwerken. Dit kan helpen om uw geografische locatie te verbergen."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Algemeen is het veiliger om Mac-adressen te spoofen, maar het zou ook verdenking kunnen verhogen of netwerkproblemen kunnen veroorzaken."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof alle MAC-adressen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netwerk configuratie"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentatie</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "De internetconnectie van deze computer is vrij van obstakels. U wilt direct connecteren met het Tor netwerk."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "De internetconnectie van deze computer is gecensureerd, gefilterd of voorzien van een proxy. U dient uw bridge, firewall of proxy instellingen te configureren."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Taal"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Lay-out"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Andere..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nn/nn.po b/nn/nn.po
index 7b29ffd..79d0950 100644
--- a/nn/nn.po
+++ b/nn/nn.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-07-30 05:02+0000\n"
-"Last-Translator: Finn Brudal <finnbrudal at yahoo.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: nn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Fram"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Innlogging"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkomen til Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Bruka vedvarande lagring?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passord:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skriveverna?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Feil passord. Prøv igjen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Fleire val?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrasjonspassord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentasjon</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Skriv inn eit handsamingspassord i tilfelle du treng å utføra handsamingsuppgåvor.\nElles vil det verta slege av for betre tryggleik."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passord:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Stadfest passord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passorda samsvarar ikkje</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adressaforfalsking"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Skriv</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Å forfalske MAC-adressor gøymer serietalet på nettverkskorti dine for dei lokale nettverki. Dette kan hjelpe deg med å gøyma den geografiske plasseringi di."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Det er generelt tryggare å forfalske MAC-adressor, men det kan òg vekka mistanke eller valde nettverkssambandsvanskar."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Forfalsk alle MAC-adressor"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Nettverksinnstillingar"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Skriv</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internettsambandet åt denne datamaskini er fri for hindringar. Du ynsker å setje deg direkte i samband med Tor-nettverket."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internettsambandet åt denne datamaskini er sensurert, filtrert eller hev proxy. Du treng å setja upp bro, brannvegg eller proxy-innstillingar."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Slå av alle nettverksfunksjonar"
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Språk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokalitet"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Utforming"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist mislukkast med returkode %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup mislukkast med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist mislukkast med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Anna …"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nso/nso.po b/nso/nso.po
index d01c67b..278e1a5 100644
--- a/nso/nso.po
+++ b/nso/nso.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Northern Sotho (http://www.transifex.com/otf/torproject/language/nso/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: nso\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/oc/oc.po b/oc/oc.po
index 26eeb12..84e4859 100644
--- a/oc/oc.po
+++ b/oc/oc.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/otf/torproject/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/om/om.po b/om/om.po
index 5856fbc..9c7aa1b 100644
--- a/om/om.po
+++ b/om/om.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2012-10-03 17:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Oromo (http://www.transifex.com/otf/torproject/language/om/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: om\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/or/or.po b/or/or.po
index 17631bd..7cf822f 100644
--- a/or/or.po
+++ b/or/or.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: or\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/pa/pa.po b/pa/pa.po
index fd982c0..74ee3eb 100644
--- a/pa/pa.po
+++ b/pa/pa.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ਅੱਗੇ"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ਲਾਗਇਨ"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "ਟੇਲਜ਼ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ਅਟੱਲਤਾ ਵਰਤਣੀ ਹੈ?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ਦਸਤਾਵੇਜ਼</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ਹਾਂ"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ਨਹੀਂ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "ਵਾਕ:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ਗਲਤ ਵਾਕ ਹੈ। ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ਹੋਰ ਚੋਣਾਂ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ਪ੍ਰਸ਼ਾਸ਼ਕੀ ਪਾਸਵਰਡ"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">ਦਸਤਾਵੇਜ਼</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "ਜੇ ਤੁਸੀਂ ਪ੍ਰਸ਼ਾਸ਼ਕੀ ਕੰਮ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਪ੍ਰਸ਼ਾਸ਼ਕੀ ਪਾਸਵਰਡ ਦਿਉ।\nਨਹੀਂ ਤਾਂ ਵੱਧ ਸੁਰੱਖਿਆ ਲਈ ਇਸ ਨੂੰ ਬੰਦ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ਪਾਸਵਰਡ:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ਦਸਤਾਵੇਜ਼</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">ਦਸਤਾਵੇਜ਼</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "ਭਾਸ਼ਾ"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "ਲੋਕੇਲ"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ਲੇਆਉਟ"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "ਹੋਰ..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/pap/pap.po b/pap/pap.po
index 8a0eabb..fd524e3 100644
--- a/pap/pap.po
+++ b/pap/pap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Papiamento (http://www.transifex.com/otf/torproject/language/pap/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: pap\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/pl/pl.po b/pl/pl.po
index d0269ec..54c88b2 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -10,180 +10,300 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "W przód"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Witamy w Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Zapisywać dane?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacja</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Tak"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nie"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Hasło:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Tylko do odczytu?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Złe hasło. Proszę spróbować ponownie.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Więcej opcji?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Hasło administracyjne"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacja</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Wprowadź hasło administracyjne, jeśli trzeba będzie wykonywać zadania administracyjne.\nW innym przypadku zostanie ono wyłączone dla większego bezpieczeństwa."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Hasło:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Powtórz Hasło:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Hasła nie pasują</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Spoofing adresu MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacja</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing adresu MAC ukrywa number seryjny Twojej kart sieciowych przed lokalnymi sieciami. To może pomóc ukryć Twoje położenie geograficzne."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalnie bezpiecznej jest korzystać z internetu po spoofingu adresu MAC, jednakże może to wzbudzić podejrzenia lub wywołać problemy z połączeniem sieciowym."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof'uj wszystkie adresy MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfiguracja sieci"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacja</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Połączenie internetowe tego komputera jest wolne od przeszkód. Chcesz bezpośrednio podłączyć się do sieci Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Połączenie internetowe tego komputera jest ocenzurowane, filtrowane lub przepuszczane przez proxy. Musisz skonfigurować most, firewall lub ustawienia proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Wyłącz wszystkie połączenia sieciowe"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Język"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ustawienia regionalne"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Wygląd"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist zakończył się błędem z kodem %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup zakończył się błędem z kodem %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist zakończył się błędem z kodem %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Inne..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/pms/pms.po b/pms/pms.po
index 0d061ae..8113ce9 100644
--- a/pms/pms.po
+++ b/pms/pms.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Piemontese (http://www.transifex.com/otf/torproject/language/pms/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: pms\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ps/ps.po b/ps/ps.po
index e936caf..cbaadfd 100644
--- a/ps/ps.po
+++ b/ps/ps.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Pushto (http://www.transifex.com/otf/torproject/language/ps/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ps\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/pt/pt.po b/pt/pt.po
index 3f01867..4012eec 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-14 14:17+0000\n"
-"Last-Translator: Manuela Silva <manuela.silva at sky.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avançar"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar Sessão"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bem-vindo ao Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usar persistência?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentação</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Sim"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Não"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de palavra-passe :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Apenas de leitura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase de palavra-passe errada. Por favor, tente novamente.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mais opções?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Palavra-passe de administração"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentação</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Digite a aplavra-passe de administração se precisar de efetuar tarefas administrativas.\nCaso contrário, esta será desativada para uma melhor segurança."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Palavra-passe:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar palavra-passe:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>As palavras-passe não correspondem</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Mascarar endereço MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentação</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mascarar endereços MAC oculta o número de série das placas de rede às redes locais. Isto pode ajudar a ocultar a sua localização geográfica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "É geralmente seguro enganar os endereços MAC, mas este também pode levantar suspeitas ou causar problemas na rede."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Personificar todos os endereços MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuração de rede"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentação</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A ligação deste computador à Internet está livre de obstáculos. Pode ligar-se diretamente à rede Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A ligação deste computador à Internet está censorada, filtrada ou redirecionada. Precisa de configurar ponte, firewall ou definições de proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Desativar toda a rede"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disposição"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "O live-persist falhou com o código de retorno %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "O cryptsetup falhou com o código de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "O live-persist falhou com o código de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Outro ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index f8c6b8e..67ac455 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-05-28 09:57+0000\n"
-"Last-Translator: Communia <ameaneantie at riseup.net>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,170 +27,290 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avançar/Encaminhar ???"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Entrar"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bem-vindo ao Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usar persistência?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentação</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Sim"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Não"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase-senha:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Somente leitura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase-senha incorreta. Por favor, tente novamente.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mais opções?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Senha do administrador"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentação</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Crie uma senha do administrador caso você precise realizar tarefas administrativas.\nCaso contrário, para maior segurança, essa função será desabilitada ."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Senha:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifique a senha:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>As senhas não correspondem</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Mascaragem de identidade de endereços MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentação</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mascarar os endereços MAC ocultará da rede local o número de série das suas placas de rede. Isso poderá ajudá-lo a ocultar a sua localização geográfica. "
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Em geral, mascarar a identidade de endereços MAC é mais seguro, mas também pode aumentar suspeitas ou causar problemas de conexão de rede."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Mascarar a identidade de todos os endereços MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuração de rede"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentação</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A conexão deste computador a Internet não apresenta obstáculos. Prefira conectar-se diretamente à rede Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A conexão a Internet desse computador está censurada, filtrada ou atrás de um proxy. Você precisa configurar as opções de ponte, de firewall ou de proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Desativar toda rede"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Modelo"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist falhou com código de retorno %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup não pôde retornar o código %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist não pôde retornar o código %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Outro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ro/ro.po b/ro/ro.po
index 62b5d5c..b424615 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: kyx <mihaidiaconu at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Înainte"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Autentificare"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bun venit la Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Vrei sa folosesti persistenta?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentatie</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nu"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Parola:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Doar-citire?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Parolă greșită. Reincercați.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mai multe opțiuni?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Parola administratorului"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentatie</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introdu o parola de administrare in cazul in care esti nevoit sa efectuezi sarcini de administrare. Altfel va fi dezactivat pentru o securitate sporita."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Parola:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifica Parola"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Parolele nu se potrivesc</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Adresă MAC falsificată"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentație</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Falsificarea adresei MAC ascunde seria plăcii de rețea în rețeaua locală. Aceasta vă poate ajuta să ascundeți poziția geografică unde vă aflați."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "În general este mai sigur să falsificați adresele MAC, dar poate crește suspiciunea sau poate cauza probleme de conectare la rețea."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Falsifică toate adresele MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configurare retea"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentație</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Această conexiune la internet a computerului este fără nici un obstacol. V-ar plăcea să vă conectați direct la rețeaua Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Această conexiune la internet a computerului este cenzurată, filtrată, sau prin proxy. Trebuie să configurați puntea, firewall-ul, sau configurările proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Dezactivați toate rețelele"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Limbă"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Traducere"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Aspect"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist eșuat cu cod returnat %(returncode)s: \n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup eșuat cu cod returnat %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist eșuat cu cod returnat %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Altele..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ru/ru.po b/ru/ru.po
index 8c10382..e8f12ed 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -8,14 +8,14 @@
# Denis Denis <stereodenis at gmail.com>, 2014
# Елисеев Дмитрий <inactive+ddark008 at transifex.com>, 2012
# Oul Gocke <beandonlybe at yandex.ru>, 2014
-# Андрей Костриков <yavinav at gmail.com>, 2016
+# Uho Lot <yavinav at gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-24 16:30+0200\n"
-"PO-Revision-Date: 2016-05-02 02:51+0000\n"
-"Last-Translator: Андрей Костриков <yavinav at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Вперёд"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Вход"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Добро пожаловать в Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Использовать постоянную память?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Документация</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Да"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Нет"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Пароль:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Только для чтения?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Неправильный пароль. Попробуйте снова.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Больше опций?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Пароль администратора"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Документация</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Введите пароль администратора для выполнения задач администрирования. В противном случае возможности администрирования будут отключены в целях безопасности."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Пароль:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Повторный ввод пароля:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Пароли не совпадают</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Подмена MAC-адреса"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Документация</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Подмена MAC-адреса скрывает серийный номер вашей сетевой карты от локальной сети. Это может помочь скрыть ваше географическое положение."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "В целом, подмена MAC-адресов безопаснее, но это может навлечь подозрения или вызвать проблему с сетевым подключением."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Подмена всех MAC-адресов"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Настройка сети"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Документация</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Сетевое подключение этого компьютера свободно от препятствий. Вы можете подключаться к сети Tor напрямую."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Сетевое подключение этого компьютера цензурируется, фильтруется или идёт через прокси-сервер. Вам надо настроить мост, брандмаузер или прокси."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Отключить все сетевые подключения"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Язык"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Место"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Раскладка"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist не сработал, код ошибки %(returncode)s:\n %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup не сработал, код ошибки %(returncode)s:\n %(stdout)s\n %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist не сработал, код ошибки %(returncode)s:\n %(stdout)s\n %(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Другое..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ru at petr1708/ru at petr1708.po b/ru at petr1708/ru at petr1708.po
index 071f880..174a0ed 100644
--- a/ru at petr1708/ru at petr1708.po
+++ b/ru at petr1708/ru at petr1708.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Russian Petrine orthography (http://www.transifex.com/otf/torproject/language/ru@petr1708/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: ru at petr1708\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Да"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Нѣтъ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Пароль:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/scn/scn.po b/scn/scn.po
index ca83936..d91cb42 100644
--- a/scn/scn.po
+++ b/scn/scn.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Sicilian (http://www.transifex.com/otf/torproject/language/scn/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: scn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/sco/sco.po b/sco/sco.po
index c9d385d..15aea55 100644
--- a/sco/sco.po
+++ b/sco/sco.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Scots (http://www.transifex.com/otf/torproject/language/sco/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: sco\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po
index 0dc10a8..0c19f62 100644
--- a/si_LK/si_LK.po
+++ b/si_LK/si_LK.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ඉදිරි දාමකරණය"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "පිරුම"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr " Tails වලට පිළිගන්නවා"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ස්ථාවර භාවිතා කරනවාද?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ඔව්"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "නැත"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "මුරවැකිය:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "කියවීමට-පමණද?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>වැරදි මුරවැකියකි. කරුණාකර නැවත උත්සාහ කරන්න.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "තවත් විකල්ප?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "පරිපාලක මුරපදය "
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "පරිපාලන කාර්යයන් කිරීමට අවශ්ය වුවිට පරිපාලක මුරපදය ඇතුළත් කරන්න .\nඑසේ නොමැති වුවහොත් වඩා ආරක්ෂාව සදහා එය දුබල වනු ඇත."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "මුරපදය:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "මුරපදය සත්යාපනය කරන්න:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>මුරපද ගැලපෙන්නේ නැත</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "භාෂාව"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "පෙදෙසිය"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "පිරිසැලසුම"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "පිලිසංකේතයක් සහිතව සජීවී-ස්ථාවර %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "පිලිකේතයක් සහිතව cryptsetup බිදවැටුණි %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "පිලිකේතයක් සහිතවසජීවී-ස්ථාවර බිදවැටුණි %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "වෙනත්..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sk/sk.po b/sk/sk.po
index b8210b5..8dcdecc 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Poslať ďalej"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prihlásenie"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Vitajte v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Použiť ukladanie na disk?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentácia</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Áno"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nie"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Heslová fráza: "
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Len na čítanie?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Nesprávne heslo. Prosím skúste znovu.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Viac možností?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administračné heslo"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentácia</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Vložte administračné heslo ak chcete robiť administračné úlohy.\nAk heslo nevložíte, bude táto možnosť deaktivovaná pre bezpečnostné účely."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Heslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrď heslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Heslá sa nezhodujú</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Spoofovanie MAC adresy"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentácia</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofovanie MAC adries skryje sériové čísla vašich sieťových kariet pre lokálne siete. Toto napomôže k schovaniu vašej geografickej polohy."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Celkovo je lepšie spoofnuť MAC adresy, na druhej strane to však môže zvýšiť podozrenie alebo spôsobiť problémy so sieťou."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoofnuť všetky MAC adresy"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Sieťová konfigurácia"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentácia</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Pripojenie tohto počítača k Internetu je bez akýchkoľvek prekážok. Asi sa teda chcete pripojiť priamo k sieti Toru."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Pripojenie tohto počítača k Internetu je cenzurované, filtrované alebo sprostredkovávané. Potrebujete si nakonfigurovať most, firewall alebo nastavenia proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jazyk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Miestne"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Rozloženie"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist zlyhal s chybovým kódom %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup zlyhal s chybovým kódom %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist zlyhal s chybovým kódom %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostatné..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index b51ba75..9278bd1 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dasa M <littlearchr8 at gmail.com>, 2016
-# Marián Mižik <marian at mizik.sk>, 2015
+# Daša Matúšová, 2016
+# Marián Mižik <inactive+marian.mizik at transifex.com>, 2015
# once, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-07-12 20:18+0000\n"
-"Last-Translator: Dasa M <littlearchr8 at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Dopredu"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prihlásenie"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Vitajte v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Použiť perzistenciu?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentácia</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Áno"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nie"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Prístupové heslo:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Iba na čítanie?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Nesprávne prístupové heslo. Prosím, skúste znova.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Viac možností?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Heslo správcu"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentácia</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Pre prípad potreby vykonávať úlohy správcu, zadajte heslo správcu.\nV opačnom prípade bude zakázané pre vyššiu bezpečnosť."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Heslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Overte heslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Heslá nesúhlasia</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Predstieranie MAC adresy"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentácia</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Predstieranie MAC adries skryje sériové číslo vašej sieťovej karty pred miestnou sieťou. To môže pomôcť skryť vašu geografickú polohu."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Je všeobecne bezpečnejšie predstierať MAC adresy, môže to však vyvolať podozrenie alebo spôsobiť problémy s pripojením."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Predstierať všetky MAC adresy"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfigurácia siete"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentácia</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Pripojenie tohto počítača na Internet je bez prekážok. Môžete sa priamo pripojiť do siete Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Pripojenie tohto počítača je cenzurované, filtrované alebo vedené cez proxy. Potrebujete nastaviť premostenie, firewall alebo proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Deaktivovať všetky siete"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jazyk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokalizácia"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Rozloženie"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist zlyhalo s kódom %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup zlyhalo s kódom %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist zlyhalo s kódom %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostatné..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sl/sl.po b/sl/sl.po
index aa4b929..cda1869 100644
--- a/sl/sl.po
+++ b/sl/sl.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprej"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Dobrodošli v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Trajna namestitev?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Geslo:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo za branje?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "Napačno geslo. Poizkusite ponovno."
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Dodatne možnosti?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Geslo upravitelja"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Če se želite lotiti upraviteljskih opravil, vnesite upraviteljsko geslo.⏎\nSicer bo slednje zavoljo večje varnosti onemogočeno."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Geslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Ponoven vnos gesla:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Gesli se ne ujemata</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Krajevne nastavitve"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postavitev"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist je spodletel z vrnjeno kodo %(returncode)s:⏎\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup je spodletel z vrnjeno kodo %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist je spodletel z vrnjeno kodo %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Drugo ..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sl_SI/sl_SI.po b/sl_SI/sl_SI.po
index e9c6d9e..72c1820 100644
--- a/sl_SI/sl_SI.po
+++ b/sl_SI/sl_SI.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/otf/torproject/language/sl_SI/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: sl_SI\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprej"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Dobrodošli v Sledi"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Uporabite vztrajanje?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Geslo za ključe:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo-Beri?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Napačno geslo. Prosimo za nov poskus.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Več možnosti?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administracijsko geslo"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Vnesite geslo administratorja za primer, da ga potrebujete za opravljanje administrativnih nalog.\nV nasprotnem primeru bo onemogočen za večjo varnost."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Geslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Preveri geslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Geslo se ne ujema</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "sleparjenje MAC naslova"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Sleparjenje MAC naslova skrije ser.št. omrežne kartice v lokalnem omrežju. S tem skrijete svoj geografski položaj."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "V glavnem je varno slepariti MAC naslov, lahko pa povzroči sumničenje ali probleme pri omrežni povezavi."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Slepari vse MAC naslove"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Nastavitev omrežja"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ta računalniška internetna povezava je brez ovir. Želite neposredno povezavo z omrežjem Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Ta računalniška internetna povezava, je cenzurirana, filtrirana ali nameščena. Morate konfigurirati nastavitve mostu, požarnega zidu ali nastavitve proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokalno"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postavitev"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ponesrečen z vrnjeno kodo %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ponesrečen z vrnjeno kodo %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ponesrečen z vrnjeno kodo %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Drugo ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sn/sn.po b/sn/sn.po
index bab7b37..38af719 100644
--- a/sn/sn.po
+++ b/sn/sn.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Shona (http://www.transifex.com/otf/torproject/language/sn/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: sn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/so/so.po b/so/so.po
index e248a27..cdefc1a 100644
--- a/so/so.po
+++ b/so/so.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Somali (http://www.transifex.com/otf/torproject/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: so\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/son/son.po b/son/son.po
index 3cd3a12..0786c91 100644
--- a/son/son.po
+++ b/son/son.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: son\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/sq/sq.po b/sq/sq.po
index b7d8fd1..71f3da7 100644
--- a/sq/sq.po
+++ b/sq/sq.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-22 15:44+0000\n"
-"Last-Translator: Bujar Tafili\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Përpara"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Hyni"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Mirë se vini tek Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Do ta përdorni vazhdueshmërinë?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacion</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Po"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Jo"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Parullë:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Vetëm për Lexim?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Parullë e gabuar. Ju lutemi përpiquni sërish.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Më shumë mundësi?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Fjalëkalimi i administrimit"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacion</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Futni një fjalëkalimin administrimi, në rasatin kur ju nevojitet të zbatoni detyrat e administrimit.\nPërkundër, ajo do të paaftësohet për një siguri më të mirë."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Fjalëkalim:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifikoni Fjalëkalimin:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Fjalëkalimet nuk përputhen</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "rreng me adresën MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacion</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Rrengu me adresat MAC e fsheh numrin serial të kartave tuaja të rrjetit, tek rrjetet lokalë. Kjo mund t'ju ndihmojë të fshihni vendndodhjen gjeografike."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Përgjithësisht është më e sigurt t'u bësh rreng adresave MAC, por kjo gjithashtu mund të ngrejë dyshime, ose të shkaktojë probleme të lidhjes së rrjetit."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Bëni rreng me të gjitha adresat MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfigurimi i rrjetit"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacion</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Lidhja Internet e këtij kompjuteri është e pastruar nga pengesat. Ju do të donit të lidheshit drejtpërdrejt në rrjetin Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Lidhja e Internetit të këtij kompjuteri është e censuruar, e filtruar ose me proxy. Duhet të konfiguroni urën, murin e zjarrtë, ose proxy-n."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Ç'aktivizoni të gjitha rrjetet"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Gjuha"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Vendndodhje"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Paraqitje"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "rikthimi i të dhënave dështoi me kodin e kthimit %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "konfigurimi i shifrimit dështoi me kodin e kthimit %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "rikthimi i të dhënave dështoi me kodin e kthimit %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Tjetër..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sr/sr.po b/sr/sr.po
index 13e2581..951d2c1 100644
--- a/sr/sr.po
+++ b/sr/sr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Напред"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Uloguj se"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Dobrodošli u Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Koristi upornost?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "NE"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo-iščitavanje?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "Pogrešna lozinka. Molimo pokušajte ponovo."
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Još opcija?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrativna lozinka"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administrativnu lozinku u slučaju da želite da vršite administratorske zadatke.\nUnače će oni biti onemogućeni radi bolje bezbednosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdi lozinku:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "Lozinke se ne podudaraju"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "."
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postava"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:⏎\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup neuspeo sa povratnim kodom %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostalo..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sr at latin/sr at latin.po b/sr at latin/sr at latin.po
index 635d8fe..46ff9d1 100644
--- a/sr at latin/sr at latin.po
+++ b/sr at latin/sr at latin.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# JanaDi <dijana1706 at gmail.com>, 2015
+# JanaDi <inactive+JanaDi at transifex.com>, 2015
# tentaclewarrior <exterminator996 at gmail.com>, 2014
# Milenko Doder <svrsavamutebe at gmail.com>, 2013
# macak <nikola.stojakovic at hotmail.com>, 2014
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/otf/torproject/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -21,170 +21,290 @@ msgstr ""
"Language: sr at latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Napred"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Uloguj se"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Dobrodošli u Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Koristi upornost?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo-iščitavanje?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "Pogrešna lozinka. Molimo pokušajte ponovo."
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Još opcija?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrativna lozinka"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administrativnu lozinku u slučaju da želite vršiti administratorske zadatke.\nInače će oni biti onemogućeni radi bolje sigurnosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdi lozinku:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "Lozinke se ne podudaraju"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Prikrivanje MAC adrese"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Prikrivanje MAC adrese je proces pri kom se sakriva serijski broj vaše mrežne kartice u lokalnoj mreži. Ovo vam može pomoći da prikrijete vašu lokaciju."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalno je bezbednije prikriti MAC adresu, ali to može izazvati mnoge probleme sa mrežnom konekcijom."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Prikrij sve MAC adrese"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Mrežna konfiguracije"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internet konekcija ovog kompjutera nema prepreke. Voleli biste da se konektujete direktno kroz Tor mrežu."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internet konekcija ovog kompjutera je cenzurisana, filtrirana ili je pod proxy-em. Morate konfigurisati most, zaštitni zid ili proxy podešavanja."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postava"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:⏎\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup neuspeo sa povratnim kodom %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostalo..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/st/st.po b/st/st.po
index 432400f..63f26a4 100644
--- a/st/st.po
+++ b/st/st.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Sotho, Southern (http://www.transifex.com/otf/torproject/language/st/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: st\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/su/su.po b/su/su.po
index 8ca79eb..dae0b04 100644
--- a/su/su.po
+++ b/su/su.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Sundanese (http://www.transifex.com/otf/torproject/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/sv/sv.po b/sv/sv.po
index 9529ea3..7552cc0 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -5,7 +5,7 @@
# Translators:
# Anders Nilsson <anders at devode.se>, 2015
# Gabor Sebastiani, 2014
-# Jonatan Nyberg <jonatan at autistici.org>, 2017
+# Jonatan Nyberg, 2017
# Isis, 2014
# WinterFairy <winterfairy at riseup.net>, 2013
# WinterFairy <winterfairy at riseup.net>, 2013-2014
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-14 02:08+0000\n"
-"Last-Translator: Jonatan Nyberg <jonatan at autistici.org>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Framåt"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Logga in"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Välkommen till Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Använd bestående?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nej"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lösenord:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skrivskyddad?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Fel lösenord. Försök igen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Fler alternativ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administratörslösenord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ange ett administratörslösenord ifall du behöver utföra administrativa uppgifter.\nI annat fall kommer administratörsåtkomst inaktiveras."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lösenord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Upprepa lösenord:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Lösenorden skiljer sig åt</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Fejka MAC-adresser"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Genom att fejka MAC-adresser döljer du serienummerna på dina nätverkskort för de lokala nätverken. Detta kan hjälpa dig dölja din geografiska position."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Vanligtvis är det säkrast att fejka MAC-adresser, men att göra så kan också väcka uppmärksamhet eller orsaka nätverksproblem."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Fejka alla MAC-adresser"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Nätverkskonfiguration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Den här datorns Internetanslutning är fri från hinder. Du vill ansluta direkt till Tor-nätverket."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Den här datorns Internetanslutning är censorerad, filtrerad eller går genom en proxy. Du behöver konfigurera brygg-, brandväggs- eller proxyinställningar."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Inaktivera alla nätverk"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Språk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Land"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Tangentbordslayout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist misslyckades med felkod %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup misslyckades med felkod %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist misslyckades med felkod %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Annat..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sw/sw.po b/sw/sw.po
index 1fb19c7..a39b992 100644
--- a/sw/sw.po
+++ b/sw/sw.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: sw\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/szl/szl.po b/szl/szl.po
index a17dc90..9f585c7 100644
--- a/szl/szl.po
+++ b/szl/szl.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Silesian (http://www.transifex.com/otf/torproject/language/szl/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: szl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ta/ta.po b/ta/ta.po
index 8ffc147..0f07226 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
"MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
"Language: ta\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ஃபார்வர்டு"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "புகுபதிகை"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tails க்கு வரவேற்கிறோம்"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "நிலைபேறு பயன்படுத்த விருப்பமா?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ஆவணங்கள்</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "சரி"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "இல்லை"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "கடவுச்சொற்றொடர்:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "படிக்க மட்டும்?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>தவறான கடவுச்சொற்றொடர். மீண்டும் முயற்சிக்கவும்.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "மேலும் விருப்பங்கள்?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "நிர்வாகத்தின் கடவுச்சொல்"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">ஆவணங்கள்</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "நிர்வாக பணிகளை செய்ய வழக்கில் உள்ள ஒரு நிர்வாகத்தின் கடவுச்சொல்லை உள்ளிடவும்.\nஇல்லையெனில் சிறந்த பாதுகாப்பு முடக்கப்படும்."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "கடவுச்சொல்:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "கடவுச்சொல்லை சரிபார்க்கவும்:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>கடவுச்சொற்கள் பொருந்தவில்லை</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC முகவரியை மாற்று"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ஆவணங்கள்</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC முகவரியை மாற்றுவது நெட்வொர்க் வன்பொருளின் வரிசை எண்ணை அக்கமுள்ள நெட்வொர்குகலிடமிருந்து மறைக்கும். இது உங்கள் புவியியல் இடத்தை மறைக்க உதவும்."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "பொதுவாக MAC முகவரிகளை மாற்றுவது பாதுகப்பானதே, ஆனாலிது சந்தேகத்தையோ அல்லது நெட்வொர்க் இணைப்பில் பிரச்சனையையோ ஏற்படுத்தலாம்."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "எல்லா MAC முகவரிகளையும் மாற்றுக"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "நெட்வொர்க் கட்டமைப்பு"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">ஆவணங்கள்</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "இந்த கணினியின் இணைய இணைப்பில் தடைகள் இல்லை. நீங்கள் நேரடியாக Tor நெட்வொர்க்குடன் இணையலாம்."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "இந்த கணினியின் இணைய இணைப்பில் தணிக்கை, வடிகட்டிதல் அல்லது Proxy போன்ற தடைகளுள்ளன. நீங்கள் Bridge, Firewall அல்லது Proxy அமைப்புகளை கட்டமைக்கவேண்டும்."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "அனைத்து நெட்வொர்க்கிங்கை முடக்கு"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "மொழி"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "காட்சிக்குரிய இடம்"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "மாதிரி"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist return code %(returncode)s:\n%(stderr)s உடன் தோல்வியடைந்தது "
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup return code %(returncode)s:\n%(stdout)s\n%(stderr)s \nஉடன் தோல்வியடைந்தது "
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist return code %(returncode)s:\n%(stdout)s\n%(stderr)s\nஉடன் தோல்வியடைந்தது "
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "மற்றவை..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/te/te.po b/te/te.po
index 9c07925..ddc6703 100644
--- a/te/te.po
+++ b/te/te.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/te_IN/te_IN.po b/te_IN/te_IN.po
index 8b80c24..41a1e49 100644
--- a/te_IN/te_IN.po
+++ b/te_IN/te_IN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: te_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "కాదు "
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/templates/tails-greeter.pot b/templates/tails-greeter.pot
index ca6532a..55d403a 100644
--- a/templates/tails-greeter.pot
+++ b/templates/tails-greeter.pot
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr "Administration Password"
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Set up an administration password if you need to perform administrative tasks. Otherwise, the administration password is disabled for better security."
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr "Enter an administration password"
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr "Confirm"
+
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr "Confirm your administration password"
+
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr "Disable"
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr "Windows Camouflage"
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr "This option makes Tails look like Microsoft Windows 10. This can be useful to avoid attracting suspicion in public places."
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welcome to Tails"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr "Microsoft Windows 10 camouflage"
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Use persistence?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr "MAC Address Spoofing"
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC address spoofing hides the serial number of your network interface (Wi-Fi or wired) to the local network. Spoofing MAC addresses is generally safer as it helps you hide your geographical location. But it might also create connectivity problems or look suspicious."
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Yes"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof all MAC addresses (default)"
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr "Don't spoof MAC addresses"
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Cannot unlock encrypted storage with this passphrase."
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "You will configure the Tor bridge and local proxy later on after connecting to a network."
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr "Welcome to Tails!"
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "More options?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
+msgid ""
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administration password"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr "Language & Region"
-#: ../glade/optionswindow.glade.h:4
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr "Default Settings"
-#: ../glade/optionswindow.glade.h:5
-msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Enter an administration password in case you need to perform administration tasks.\nOtherwise it will be disabled for better security."
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr "Save Language & Region Settings"
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Password:"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr "_Language"
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verify Password:"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr "_Keyboard Layout"
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr "_Formats"
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC address spoofing"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr "_Time Zone"
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing MAC addresses hides the serial number of your network cards to the local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr "Show Passphrase"
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "It is generally safer to spoof MAC addresses, but it might also raise suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr "Configure Persistent Storage"
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Enter your passphrase to unlock the persistent storage"
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Network configuration"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr "Unlock"
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr "Relock Persistent Storage"
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "This computer's Internet connection is clear of obstacles. You would like to connect directly to the Tor network."
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
-#: ../glade/optionswindow.glade.h:18
-msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "This computer's Internet connection is censored, filtered, or proxied. You need to configure bridge, firewall, or proxy settings."
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
-#: ../glade/optionswindow.glade.h:19
-msgid "Disable all networking"
-msgstr "Disable all networking"
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr "Save Additional Settings"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr "Add an additional setting"
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: ../data/greeter.ui.h:40
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "If your Internet connection is censored, filtered, or proxied you can configure a Tor bridge or a local proxy. To work completely offline, you can disable all networking."
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Language"
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connect directly to the Tor network (default)"
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Locale"
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configure a Tor bridge or local proxy"
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:43
+msgid "Disable all networking"
+msgstr "Disable all networking"
+
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr "_Administration Password"
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr "Off (default)"
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr "On (default)"
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr "Direct (default)"
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr "_Windows Camouflage"
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy"
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr "Failed to relock persistent storage."
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr "Unlocking…"
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr "Additional Settings"
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr "Add"
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr "Back"
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr "Shutdown"
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr "_Start Tails"
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr "live-persist failed with return code {returncode}:\n{stderr}"
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "cryptsetup failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "live-persist failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Other..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
diff --git a/tg/tg.po b/tg/tg.po
index 3ca3268..f7d1ff2 100644
--- a/tg/tg.po
+++ b/tg/tg.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Tajik (http://www.transifex.com/otf/torproject/language/tg/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: tg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/th/th.po b/th/th.po
index 26cc501..f8cb18f 100644
--- a/th/th.po
+++ b/th/th.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-31 06:37+0000\n"
-"Last-Translator: kanesayan gwangsai <thailand.1.2009.00067.77.9 at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,170 +21,290 @@ msgstr ""
"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "เดินหน้า"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "เข้าสู่ระบบ"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "ยินดีต้อนรับสู่ Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "จำการใช้งาน?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">คู่มือการใช้งาน</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ใช่"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ไม่"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "อ่านอย่างเดียวเท่านั้น?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>วลีผ่านผิด ลองอีกครั้ง</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ตัวเลือกเพิ่มเติม?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "รหัสผ่านเพื่อการดูแลระบบ"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "ใช้รหัสผ่านเพื่อการดูแลระบบในกรณีที่คุณต้องการทำงานดูแลระบบ ในกรณีอื่นมันจะถูกปิดใช้เพื่อให้ปลอดภัยมากขึ้น"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "รหัสผ่าน:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ยืนยันรหัสผ่าน:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>รหัสผ่านไม่ตรงกัน</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ตั้งค่าเครือข่าย"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "ภาษา"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "โลแคล"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "โครงแบบ"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ล้มเหลวด้วยรหัสตอบกลับ %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ล้มเหลวด้วยรหัสตอบกลับ %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ล้มเหลวด้วยรหัสตอบกลับ %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "อื่นๆ..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ti/ti.po b/ti/ti.po
index 3f543d4..a61446a 100644
--- a/ti/ti.po
+++ b/ti/ti.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ti\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/tk/tk.po b/tk/tk.po
index 7a0c434..729f4b7 100644
--- a/tk/tk.po
+++ b/tk/tk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Turkmen (http://www.transifex.com/otf/torproject/language/tk/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: tk\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/tr/tr.po b/tr/tr.po
index f7ba690..b5716e9 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -5,7 +5,7 @@
# Translators:
# sgtpepper <barlasmirc at gmail.com>, 2013
# Bullgeschichte <bullgeschichte at riseup.net>, 2015
-# Caner Başaran <basaran.caner at gmail.com>, 2013
+# Caner Başaran <basaran.caner at protonmail.com>, 2013
# cmldrs, 2014
# cmldrs, 2014
# Kaya Zeren <kayazeren at gmail.com>, 2015
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-20 09:35+0000\n"
-"Last-Translator: Volkan Gezer <volkangezer at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,170 +28,290 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "İleri"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Oturum aç"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tails'e Hoş Geldiniz"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Kalıcılık kullanılsın mı?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Belgeler</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Evet"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Hayır"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Parola ifadesi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Salt okunur mu?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Parola ifadesi hatalı. Lütfen yeniden deneyin.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Diğer seçenekler?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Yönetim parolası"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.tr.html\">Belgeler</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Bilgisayarda yönetim görevleri gerçekleştirecekseniz, bir yönetim parolası yazın. Yoksa güvenlik için devre dışı bırakılır."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Parola:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Parola Onayı:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Parola ile onayı eşleşmiyor</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adresi yanıltma"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.tr.html\">Belgeler</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adreslerini yanıltmak ağ kartlarınızın seri numarasını yerel ağlardan gizler. Bu özellik coğrafi konumunuzu gizlemenize yardımcı olabilir."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "MAC adreslerini yanıltmak genellikle güvenlidir, ama şüphe uyandırabilir ya da ağ bağlantısı sorunlarına neden olabilir."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Tüm MAC adreslerini yanıltma"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Ağ ayarları"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.tr.html\">Belgeler</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Bu bilgisayarın İnternet bağlantısında herhangi bir engelleme yok. Doğrudan Tor ağına bağlanmak istiyorsunuz."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Bu bilgisayarın İnternet bağlantısı sansürleniyor, süzülüyor ya da vekil sunucuya bağlı. Köprü, güvenlik duvarı ya da vekil sunucu ayarlarını yapmanız gerekir."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Tüm ağı devre dışı bırak"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Dil"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Yerel ayar"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Düzen"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "Canlı tut işlemi şu kod ile tamamlanamadı %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup işlemi şu kod ile tamamlanamadı %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "canlı tut şu kodla tamamlanamadı: %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Diğer..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/tzm/tzm.po b/tzm/tzm.po
index 1307b77..7c7c4e0 100644
--- a/tzm/tzm.po
+++ b/tzm/tzm.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 15:05+0100\n"
-"PO-Revision-Date: 2012-10-03 17:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: tzm\n"
"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ug at Arab/ug at Arab.po b/ug at Arab/ug at Arab.po
index 76b6ece..c67d209 100644
--- a/ug at Arab/ug at Arab.po
+++ b/ug at Arab/ug at Arab.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-06-08 07:03+0000\n"
-"Last-Translator: crash x <xmr.crashx at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: ug at Arab\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "مرحبا بك في تايلز"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "نعم"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "لا"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "كلمة المرور"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "اللغة"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/uk/uk.po b/uk/uk.po
index 68a31ee..a1730c4 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -21,170 +21,290 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Вперед"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Користувач"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ласкаво просимо у Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Використовувати постійну пам'ять?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Документація</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Так"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ні"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ключова фраза:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Тільки для читання?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Неправильний пароль. Спробуйте знову.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Більше налаштувань"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Пароль адміністратора"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Документація</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Введіть пароль адміністратора для виконання адміністрування.\nУ протилежному випадку адміністрування буде вимкнено в цілях безпеки."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Пароль"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Повторити пароль"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Паролі не збігаються</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Підміна MAC-адрес"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Документація</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Підміна MAC-адреси приховує серійний номер вашої мережевої карти від локальної мережі. Це може допомогти приховати ваше географічне положення."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Як правило, використовувати підміну MAC-адрес безпечніше, але це може викликати підозри або проблеми з мережевим з'єднанням."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Підміна всіх MAC-адрес"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Налаштування мережі"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Документація</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Мережеве з'єднання цього комп'ютера вільне від перешкод. Ви можете з'єднатися з мережею Tor безпосередньо."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Мережеве підключення цього комп'ютера цензурується, фільтрується або йде через проксі-сервер. Вам треба налаштувати міст, брандмауер або проксі."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Вимкнути всі з'єдання"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Мова"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Місце"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Схема"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist не спрацював, код помилки %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup не спрацював, код помилки %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist не спрацював, код помилки %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Інше..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ur/ur.po b/ur/ur.po
index b83af0d..9946496 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-08-25 07:46+0000\n"
-"Last-Translator: Muhammad Sohaib Raza <sohaibraza000 at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "آگے"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "جی ہاں"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "نہیں"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "مزید اختیارات؟"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ur_PK/ur_PK.po b/ur_PK/ur_PK.po
index e1f5f3a..71f3468 100644
--- a/ur_PK/ur_PK.po
+++ b/ur_PK/ur_PK.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/otf/torproject/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "آگے بڑھائیے"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "لاگ ان"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ہاں"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "نہیں"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "مزید آپشنز؟"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "زبان"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/uz/uz.po b/uz/uz.po
index 1415a79..fcf3284 100644
--- a/uz/uz.po
+++ b/uz/uz.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ha"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Yo'q"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Maxfiy so'z:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Til"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/ve/ve.po b/ve/ve.po
index 157c3af..fcd0d3a 100644
--- a/ve/ve.po
+++ b/ve/ve.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Venda (http://www.transifex.com/otf/torproject/language/ve/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: ve\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/vi/vi.po b/vi/vi.po
index 0a17222..b8b841c 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-10-01 03:17+0000\n"
-"Last-Translator: Khanh Nguyen <nguyenduykhanh85 at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Chuyển tiếp"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Đăng nhập"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Chào mừng đến với Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Sử dụng vùng bền vững?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Tài liệu</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Có"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Không"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Đoạn mật khẩu:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Chỉ đọc?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Sai đoạn mật khẩu. Vui lòng thử lại.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Thêm tùy chọn?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Mật khẩu quản trị"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Nhập một mật khẩu quản trị trong trường hợp bạn cần thực hiện các tác vụ quản trị\nNếu không nó có thể bị vô hiệu để an ninh hơn."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Mật khẩu:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Xác minh mật khẩu:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Mật khẩu không đúng</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Đang giả địa chỉ MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Tài liệu</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Việc giả địa chỉ MAC ẩn chuỗi số của card mạng của bạn đối với mạng nội bộ. Việc này có thể giúp bạn ẩn vị trí địa lý."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Thường thì sẽ an toàn hơn nếu giả địa chỉ MAC, nhưng nó cũng gây ra sự nghi ngờ hoặc gây nên vấn đề về kết nối mạng lưới."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Giả tất cả các địa chỉ MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Cấu hình mạng lưới"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Tài liệu</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Việc kết nối Internet của máy tính này đã hết sạch những chướng ngại. Bạn muốn kết nối trực tiếp tới mạng lưới Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Việc kết nối Internet của máy tính này bị kiểm duyệt, lọc, hoặc thay thế. Bạn cần phải cấu hình cầu nối, tường lửa hoặc các cài đặt thay thế."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "Vô hiệu tất cả mạng lưới"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Ngôn ngữ"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Nơi xảy ra"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Nền"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist thất bại với mã trả lại %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cyptsetup thất bại với mã trả về %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist thất bại với mã trả về %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Khác..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/wa/wa.po b/wa/wa.po
index cd02d5d..feb4e31 100644
--- a/wa/wa.po
+++ b/wa/wa.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Walloon (http://www.transifex.com/otf/torproject/language/wa/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: wa\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/wo/wo.po b/wo/wo.po
index 40bc42d..c22bc19 100644
--- a/wo/wo.po
+++ b/wo/wo.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Wolof (http://www.transifex.com/otf/torproject/language/wo/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: wo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 4a0d091..d43c343 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Chi-Hsun Tsai <chihsun.tsai at gmail.com>, 2017
+# Chi-Hsun Tsai, 2017
# ihints <inactive+ihints at transifex.com>, 2014
# khi, 2013
# khi, 2013
@@ -20,9 +20,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-03-16 01:52+0000\n"
-"Last-Translator: Chi-Hsun Tsai <chihsun.tsai at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,170 +30,290 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "前进"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "登录"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "欢迎进入 Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "使用持久保存工作数据？"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "是"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "否"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "密语："
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "唯读？"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>密语错误，请再次尝试</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "更多选项？"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "管理员密码"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">文档</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "若需使用于管理员任务，在此输入管理员密码。否则将因安全保护而禁用。"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "密码："
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "确认密码："
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>密码不正确</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC 地址欺骗"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">文档</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "欺骗 MAC 地址，隐匿您的网卡到本地网络的序列号。这可以帮助您隐藏自己的地理位置。"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "欺骗 MAC 地址通常都是安全的，但也存在引发或导致网络连通问题的可能。请参阅文档。"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "欺骗所有 MAC 地址"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "网络设置"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">文档</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "该电脑的连接故障已排除，您可以直接连接Tor网络。"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "该电脑的互联网链接被屏蔽。你需要配置网桥、防火墙或者代理设置。"
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "禁用所有网络"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "语言"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "地区"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "布局"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "负责持久储存设置的 live-persist 执行失败，返回代码 %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "加密设置失败，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "负责持久储存设置的 live-persist 执行失败，，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "其他..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 7ccb00c..b60f4a0 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -4,21 +4,21 @@
#
# Translators:
# brendanyan <yan.brendan at gmail.com>, 2014
-# CasperLi_HK <casper.hk at hotmail.com>, 2013
+# Casper Li <casper.hk at hotmail.com>, 2013
# Christian Chung <alphachungys at gmail.com>, 2016
-# 洋蔥圈, 2016
-# CasperLi_HK <casper.hk at hotmail.com>, 2013
+# 大圈洋蔥, 2016
+# Casper Li <casper.hk at hotmail.com>, 2013
# ronnietse <tseronnie at ymail.com>, 2014
# ronnietse <tseronnie at ymail.com>, 2014
# brendanyan <yan.brendan at gmail.com>, 2014
-# 洋蔥圈, 2016
+# 大圈洋蔥, 2016
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-04-15 03:23+0000\n"
-"Last-Translator: 洋蔥圈\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,170 +26,290 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "下一步"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "登入"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "歡迎嚟到Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "使用持續性？"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">文件</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "是"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "否"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "通關句語："
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "唯讀？"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>密碼錯誤。請再試一次。</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "更多選項？"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "管理員密碼"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">文件</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "需要執行管理任務，請輸入管理員密碼。\n日常情況下最好停用管理員權限，以取得更佳嘅安全度。"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "密碼："
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "確認密碼："
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>密碼唔相符</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC位址偽裝"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">文件</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC位址偽裝可以於區域網絡中隱藏你嘅網絡咭序號，以助你隱藏地理位置。"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "一般嚟講MAC位址偽裝係安全嘅，但佢也可能會引起懷疑或導致網絡連線問題。"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "偽裝全部MAC位址"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "網絡設定"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">文件</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "呢部電腦嘅網絡連接沒有任何障礙。你會想直接連接Tor洋蔥路由網絡。"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "呢部電腦嘅網絡連線被審查、被過濾或被代理。你須設定橋接器、防火牆或代理伺服器。"
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "停用全部網絡"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "語言"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "地區設定"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "版面佈置"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist失敗，傳回錯誤代碼%(returncode)s：\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "設定密碼失敗，傳回代碼%(returncode)s：\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist失敗，傳回錯誤代碼%(returncode)s：\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "其他…"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 4b9a7d4..a1a8976 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-21 05:27+0000\n"
-"Last-Translator: Agustín Wu <losangwuyts at gmail.com>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "下一頁"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "登入"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "歡迎使用 Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "使用持續性?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">文件</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "是"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "否"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "通關密語："
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "唯讀？"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>通關密語錯誤，請再試一次</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "更多選項？"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "系統管理密碼"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">文件</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "如果您需要執行系統管理工作時請輸入系統管理員密碼。\n否則會因安全考量而被停用。"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "密碼："
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "確認密碼："
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>密碼不符</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "網路卡實體位址偽裝"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">文件</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "網路卡實體位址偽裝功能可以在區域網路中隱藏您的網路卡序號，這可以幫助您隱藏您所在的地理位置。"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "一般來說偽裝網路卡實體位址是比較安全的，但它也可能會引起懷疑或導致網路連線出問題。"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "偽裝所有的網路卡實體位址"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "網路設定"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">文件</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "此電腦的網路連線很通暢，您或許會想要直接連線到洋蔥路由網路。"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "此電腦的網路連線被審查或過濾，您需要設定橋接器、防火牆或代理伺服器。"
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr "停用所有網路"
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "語言"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "語系設定"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "版面配置"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "加密設定失敗，傳回代碼 %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "其他..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/zu/zu.po b/zu/zu.po
index ee3819c..609fc85 100644
--- a/zu/zu.po
+++ b/zu/zu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Zulu (http://www.transifex.com/otf/torproject/language/zu/)\n"
"MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
"Language: zu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
msgstr ""
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
msgstr ""
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
msgstr ""
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
msgstr ""
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
msgstr ""
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
msgstr ""
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
msgstr ""
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
msgstr ""
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
msgstr ""
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
msgstr ""
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
msgstr ""
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
msgstr ""
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
msgstr ""
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
msgstr ""
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
msgstr ""
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
msgstr ""
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
msgid "Disable all networking"
msgstr ""
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlocking…"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
msgstr ""
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
msgstr ""
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
msgstr ""
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
msgstr ""
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
msgstr ""
More information about the tor-commits
mailing list