[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

21 Sep 2017

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

diff --git a/ach/ach.po b/ach/ach.po
index 4aefb47e4..2e00d7194 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ady/ady.po b/ady/ady.po
index 70e2dc8f6..0be7886fb 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Adyghe (http://www.transifex.com/otf/torproject/language/ady/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/af/af.po b/af/af.po
index e343e95c4..1d824eeba 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 18:52+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ak/ak.po b/ak/ak.po
index df51e6218..c1ef947cf 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Akan (http://www.transifex.com/otf/torproject/language/ak/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/am/am.po b/am/am.po
index ba5c95539..6fd1cd35a 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ar/ar.po b/ar/ar.po
index d9742e953..fc8869837 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -114,179 +114,179 @@ msgstr "غير قادر علي إزالة مجلد من نظام التشغيل
 msgid "Cannot find device %s"
 msgstr "لا يمكن العثور على الجهاز %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "غير قادر على الكتابة على الجهاز %(device)s، سيتم التجاوز."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "بعض اقسام الجهاز المختار %(device)s مركبة. سيتم فكهم قبل بدء عملية التثبيت."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "نظام ملفات غير معرف. قد يحتاج جهازك إلى إعادة تشكيل."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "نظام ملفات غير مدعوم: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "غير قادر على تركيب جهاز: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "لا توجد نقاط تركيب"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "يتم الدخول على unmount_device للجهاز '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "إزالة تثبيت نظام الملفات من '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "إزالة تثبيت '%(udi)s' على '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "تركيب %s موجود بعد إزالة الجهاز"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "تقسيم الجهاز %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "جاري تحديث خصائص تجزئة القرص الخاصة بالنظام %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "هذا الجهاز غير مدعوم '%(device)s', الرجاء الابلاغ عن العطل."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "على أية حال سوف أحاول المتابعة."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "جاري التحقق من نظام الملفات"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "غير قادر على تغيير عنوان القرص: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "تنصيب نظام الاقلاع ..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "إزالة ملفات %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s جاهز للأقلاع "
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "غير قادر على ايجاد تقسيمة القرص"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "يتم إعادة تشكيل جهاز %(device)s كنظام FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "إعادة ضبط سجل الإقلاع الرئيسي الخاص بـ %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "نوع القرص loopback ، سيتم تجاوز إعادة ضبط سجل الإقلاع الرئيسي"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "يتم حساب SHA1 الخاص بـ %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "مزامنة البيانات الموجودة على القرص ..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "خطأ بفحص الجهاز"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "غير قادر على العثور على أي جهاز مدعوم"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "تأكد أن قرص الـ USB متصل بالجهاز وتم تشكيلة بنظام الملفات FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "نظام ملفات غير مدعوم: %s\nالرجاء نسخ قرص USB نسخة احتياطية ثم تشكيلة بنظام الملفات FAT"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "غير قادر علي الحصول علي Win32_LogicalDisk; win32com الطلب لم ينتج عنه أي نتائج"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "لا يمكن العثور"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -317,40 +317,48 @@ msgstr "تم التثبيت! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "تنبيه: يجب تنفيذ هذه الأداة بصلاحيات مدير النظام. لعمل هذا، انقر باليمين على الأيقونة وافتح الخصائص. في صفحة "Compatibility/التوافقية"، فعل الخيار "Run this program as an administrator/قم بتشغيل هذا التطبيق كمدير"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -358,42 +366,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "الجهاز "%(pretty_name)s" ليس لديه السعة الكافية لتثبيت Tails (مطلوب%(size)s جيجابايت على الأقل)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "تحديث النشرات..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "تم تحديث النشرات!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "تم التثبيت!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "لا يمكن تركيب الجهاز"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -401,39 +409,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "تم التحميل!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "التحميل فشل: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "تستطيع المحاولة مرة أخرى لاستئناف التحميل"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "الملف المختار غير قابل للقراءة. الرجاء تغيير صلاحياته أو اختيار ملف آخر."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "لا يمكن استخدام الملف المُحدد. قد يحالفك حظ أكثر إن نقلت ملف الأيزو إلى المجلد الرئيسي لقرصك (C:\ على سبيل المثال)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "تم تحديد %(filename)s"
@@ -504,86 +521,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "ثبت تيلز"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/arn/arn.po b/arn/arn.po
index c20e6e0ef..3db6c6f06 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Mapudungun (http://www.transifex.com/otf/torproject/language/arn/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ast/ast.po b/ast/ast.po
index 3f35b8145..a604e4490 100644
--- a/ast/ast.po
+++ b/ast/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Nun pudo alcontrase'l preséu %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistema de ficheros non sofitáu: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verificando sistema de ficheros..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Decátese de que la so unidá USB ta coneutada y formatiada col sistema de ficheros FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Sistema de ficheros non sofitáu: %s\nPor favor, fai copia de seguridá y da-y formatu al to discu USB col sistema de ficheros FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "¡Descarga completa!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Falló la descarga:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Puedes intentar otra vuelta facer la descarga"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/az/az.po b/az/az.po
index 3048a8d83..389cb0ecc 100644
--- a/az/az.po
+++ b/az/az.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -103,179 +103,179 @@ msgstr "Əvvəlki CanlıOS-dən kataloqin çıxarılması alınmır: %(message)s
 msgid "Cannot find device %s"
 msgstr "%s cihazı tapılmadı"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "%(device)s üzərinə yazılma alınmadı, ötürülür."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "%(device)s nişanlanmış ötürücünün bəzi bölmələri quraşdırılmışdır. Qurşadırılma prosesi başlanmazdan əvvəl onlar geri quraşdırılacaqlar."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Bilinməyən fayl sistemi. Cihazının yenidən formatlanmağa ehtiyacı ola bilər."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Dəstəklənməyən fayl sistemi: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Ötürücünün quraşdırılması alınmır: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Quraşdırılan nöqtələr tapılmadı"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "'%(device)s' üçün ötürücünün_yenidən quraşdırılması"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "'%(device)s' üzərində quraşdırılmış fayl sisteminin geri quraşdırılması"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "'%(udi)s'-nin '%(device)s' üzərində geri quraşdırılması"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "%s-in quraşdırılması quraşdırılmanın olmamasından sonra mövcud olur"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "%(device)s bölmə ötürücüsü"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "%(system_partition)s sistem bölməsinin seçimlərinin yenilənməsi"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Dəstəklənməyən '%(device)s' ötürücüsü, problemi mütləq bölüş."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Heç nəyə baxmayaraq davam etməyə cəhd edilir."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Fayl sisteminin yoxlanışı..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Səs səviyyəsinin dəyişilməsi uğursuzdur: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Yükləyicinin quraşdırılması..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)s xaric edilməsi"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s artıq boot edilə biləndir"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Hər hansı bölmə tapılmır"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s-ın FAT32 kimi formatlanması"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "%s üçün Master Yükləmə Qeydinin Sıfırlanması"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Ötürücüdə qısaqapanma var, MBR yenilənməsini ötürür"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "%s üçün SHA1 hesablanır"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Diskdəki məlumatın sinxronlaşdırılması..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Ötürücünün tədqiqat xətası"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Hər hansı dəstək ötürücüsü tapılmır"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "USB açarının FAT fayl sistemi ilə daxil edildiyindən və formatlandığından əmin ol"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Dəstəklənməyən fayl sistemi: %s\nLütfən USB açarını FAT fayl sistemi vasitəsilə arxivləşdirib formatla."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Win32_LogicalDisk əldə edilə bilmir; win32com sorğusu heç bir nəticə vermədi"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Tapılmadı"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -306,40 +306,48 @@ msgstr "Quraşdırma tamamlandı! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Təhlükə: Bu qurğu Administrator tərəfindən işlədilməlidir. Bunu etmək üçün işarənin üzrəində sağ düyməni sıx və "Properties" seçimini et. "Compatibility tab" başlığı altında "Run this program as an administrator"qutusunu işarələ."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -347,42 +355,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Buraxılışların yenilənməsi..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Buraxılışlar yeniləndi!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Quraşdırma tamamlandı!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Ötürücünün quraşdırılması alınmır"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -390,39 +398,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Endirmə tamamlandı!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Endirmə mümkün olmadı:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Endirmənizə qayıtmaq üçün təkrar yoxlaya bilərsiz"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Seçilmiş fayl oxunmur. Lütfən, onun icazələrini düzəlt, ya da başqa fayl seç."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Seçilmiş faylın istifadəsi alınmır. ISO-nu əsas yaddaşa köçürsən (məs., C:\) daha çox şansın olar."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seçilmişdir"
@@ -493,86 +510,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tail-ları Quraşdır"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ba/ba.po b/ba/ba.po
index 4a4133c4c..d03ccc236 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Bashkir (http://www.transifex.com/otf/torproject/language/ba/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/be/be.po b/be/be.po
index f7be38cc2..da0294e17 100644
--- a/be/be.po
+++ b/be/be.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/bg/bg.po b/bg/bg.po
index 2c2b7188f..990bce601 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:25+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -109,179 +109,179 @@ msgstr "Не може да се изтрие директорията от ми
 msgid "Cannot find device %s"
 msgstr "Не мога да открия устройството %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Не мога да запиша на %(device)s, прескачане."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Някои дялове от целевото устройство %(device)s са монтирани.Те ще бъде демонтирани, преди да започне процеса на инсталация."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Неизвестна файлова система. Вашето устройство може да се наложи да се преформатира."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Неподдържана файлова система: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Непозната GLib грешка по време на прикачване на устройството: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Не може да се монтира устройството: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Не са намерени точки на монтиране"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Въвеждане на unmount_device for '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Демонтиране на монтирани файлови системи за '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Демонтиране на '%(udi)s' на '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Монтира %s съществува след откачване"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Разделяне на устройство %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Актуализиране свойства на системния дял %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Неподдържано устройство '%(device)s', моля, съобщите за бъг."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Опитвайки да продължи така или иначе."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Проверка на файловата система ..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Невъзможно да промените етикета на обем: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Инсталиране на буутлоудър ..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "'%s' COM32 модулът не е открит"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Премахване на %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s вече зареждащ"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Не мога да намеря дял"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Форматиране %(device)s като FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "syslinux' gptmbr.bin не е открит"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Прочитане на изтегления MBR от %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Неуспешно прочитане на изтегленият MBR от %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Възстановяване Master Boot Record of %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Устройство е примка,прескача нулиране на MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Изчисляване на SHA1 за %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Синхронизиране на данните на диска ..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Грешка при сондиране устройство"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Не може да намери каквото и да е поддържано устройство"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Уверете се, че USB ключ е включен и форматирани с FAT файлова система"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Неподдържана файлова система: %s⏎ Моля, направите резервно копие и форматирате USB ключ с FAT файлова система."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Не може да получи Win32_LogicalDisk; win32com заявка не върна никакви резултати"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Не мога да намеря"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -312,40 +312,48 @@ msgstr "Инсталацията е извършена! (%s)"
 msgid "Tails installation failed!"
 msgstr "Инсталацията е неуспешна!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Внимание: Този инструмент трябва да се пуска като администратор. За да направите това, щракнете с десния бутон върху иконата и отвори Properties. В раздела Compatibility tab, маркирайте кутия "Run this program as an administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails Инсталатор"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Обновяване на версията"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Инсталиране"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Не е открито устройство, на което може да бъде инсталиран Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Моля, прикачете USB флашка или SD карта с поне %0.1f ГБ."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -353,42 +361,42 @@ msgid ""
 "different model."
 msgstr "USB флашката "%(pretty_name)s" е настроена като непреносима от производителя ѝ и Tails няма да успее да стартира на нея. Моля, опитайте на различен модел."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Устройството "%(pretty_name)s" е твърде малко, за да инсталирате Tails (най-малко %(size)s GB се изисква)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Възникна грешка по времен на инсталацията на Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Обновяване на изданията..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Изданията са обновени!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Инсталацията е извършена!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Инсталацията е завършена."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Не може да се монтира устройство"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -396,39 +404,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Изтеглянето е завършено!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Изтеглянето се провали:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Можете да опитате отново да възобнови те  изтеглянето"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Избраният файл не може да бъде прочетен. Моля, поправете правата върху него, или изберете друг файл."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Невъзможност за използване на избрания файл. Може да имате по-голям късмет, ако се движите ISO до root на вашия диск (ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s избрано"
@@ -499,86 +516,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Инсталиране на Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "За да стартирате Tails инсталатора се нуждаете от ISO файл, който може да бъде итеглен от уебсайта на Tails: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Инсталиране"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Инсталиране на Tails на нова USB флашка."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB флашката, на която ще се инсталира ще бъде форматирана и всичката ѝ информация ще бъде изгубена."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Обновяване на версията"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Обновяване на версията на Tails USB флашлката  до версията на ISO файла."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Криптираното, постоянно дисково пространство на Tails USB флашката, която обновявате ще бъде запазено."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Нуждаете се от помощ? Прочетете <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3E%D0%B4%D0%BE%D0...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Инсталиране чрез клониране"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Инсталиране на Tails на друга USB флашка, копирайки Tails, който използвате в момента."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Криптираното, постоянно дисково пространство на Tails USB флашката, която използвате в момента, няма да бъде копирано."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Обноване на версията чрез клониране"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Обновяване на друга Tails USB флашката до същата версия на Tails, която използвате в момента."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Обновяване на версията чрез ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Обновяване на друга Tails USB флашка до версията на ISO файл."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Нуждаете се от помощ? Прочетете <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">документацията</a>"
diff --git a/bn/bn.po b/bn/bn.po
index b44348c7e..fa9a4a4c6 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "ইনস্টলকরণ সম্পূর্ণ!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ডাউনলোড সম্পূর্ণ!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po
index d9a6cff06..cf28a6f5b 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/bn_IN/bn_IN.po b/bn_IN/bn_IN.po
index c42ef4a89..50662cccb 100644
--- a/bn_IN/bn_IN.po
+++ b/bn_IN/bn_IN.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/otf/torproject/language/bn_IN/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "ফাইলসিস্টেম যাচাই করা হচ্ছে..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ডাউনলোড সম্পূর্ণ!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "ডাউনলোড অসমাপ্ত:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/bo/bo.po b/bo/bo.po
index 9dd156043..83751129c 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Tibetan (http://www.transifex.com/otf/torproject/language/bo/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/br/br.po b/br/br.po
index 895d21fa1..1e50e4b73 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/brx/brx.po b/brx/brx.po
index ef1a37146..d72bb28da 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Bodo (http://www.transifex.com/otf/torproject/language/brx/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/bs/bs.po b/bs/bs.po
index 0b048d871..b10f3f6b5 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Neuspjelo pronalaženje uređaja %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepodržan sistem datoteka: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Provjeravanje sistema datoteka..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pobrinite se da je Vaš USB ključ priključen i formatiran sa FAT sistemom datoteka"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepodržan sistem datoteka: %s\nMolimo da sačuvate kopiju Vašeg USB ključa i da ga formatirate sa FAT sistemom datoteka."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Snimanje završeno!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Snimanje nije uspjelo:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Možete pokušati ponovo da nastavite svoje snimanje"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ca/ca.po b/ca/ca.po
index 49b0aeaa6..cb01c5fa1 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -110,179 +110,179 @@ msgstr "No s'ha pogut eliminar el directori del Sistema Operatiu previ: %(messag
 msgid "Cannot find device %s"
 msgstr "No s'ha pogut trobar el dispositiu %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "No s'ha pogut escriure a %(device)s, s'omet."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algunes particions del dispositiu de destinació %(device)s estan muntades. Es desmuntaran abans de començar el procés d'instal·lació."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "El sistema de fitxers és desconegut. S'ha de formatar el dispositiu."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "El sistema de fitxers de %s no està suportat."
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "No s'ha pogut muntar el dispositiu: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "No es troben els punts de muntatge"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Entrant a unmount_device de '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Desmunant el sistema d'arxius muntat a '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Desmuntant '%(udi)s' a '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "El punt de muntatge %s segueix existint després de desmuntar-lo"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Creant particions a %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Actualitzant les propietats de la partició de sistema %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "El dispositiu '%(device)s' no és compatible, si us plau, informeu d'un error."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Provant de continuar de totes maneres."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Comprovant el sistema de fitxers..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "No s'ha pogut canviar l'etiqueta del volum: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instal·lant el carregador de l'arrencada… "
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Suprimint %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s ja pot arrencar"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "No s'ha pogut trobar la partició"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatant %(device)s a FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Reconfigurant el Master Boot Record de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "La unitat és de tipus virtual de repetició, s'omet el reinici del MBR..."
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculant la suma de verificació SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sincronitzant les dades del disc..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Error en verificar el dispositiu"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "No s'ha pogut trobar cap dispositiu compatible"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Assegureu-vos que la vostra clau USB estigui connectada i que tingui un sistema de fitxers FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "El sistema de fitxers %s no està suportat\nDeseu la informació i formateu la memòria USB amb un sistema de fitxers FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "No s'ha pogut obtenir el Win32_LogicalDisk; la consulta win32com no ha donat cap resultat"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "No s'ha pogut trobar"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -313,40 +313,48 @@ msgstr "Instal·lació complerta! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Atenció: Aquesta eina necessita ser executada com Administrador. Per fer-ho, premeu el botó dret a la icona i obriu Propietats. Sota la pestanya de Compatibilitat, activeu la casella "Executa aquest programa com administrador"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -354,42 +362,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "El dispositiu "%(pretty_name)s" és massa petit per instal·lar-hi el Tails (es necessiten com  mínim %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Cercant noves versions..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Noves versions actualitzades!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instal·lació complerta!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "No s'ha pogut muntar el dispositiu."
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -397,39 +405,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Baixada completa!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Ha fallat la baixada:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Podeu tornar-ho a intentar per continuar la vostra baixada"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "El fitxer seleccionat no s'ha pogut llegir. Ajusteu els permisos o seleccioneu un altre fitxer."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "No s'ha pogut fer servir l'arxiu seleccionat. Moveu l'ISO a l'arrel de la unitat (per exemple: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seleccionat"
@@ -500,86 +517,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instal·la Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ceb/ceb.po b/ceb/ceb.po
index affda828a..1268be095 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Cebuano (http://www.transifex.com/otf/torproject/language/ceb/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/cs/cs.po b/cs/cs.po
index d6682c534..9f3072b87 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -112,179 +112,179 @@ msgstr "Nemohu odebrat složku z předchozího LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Nemohu nalézt zařízení %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nemohu zapisovat na %(device)s, přeskakuji."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Některé oddíly, které jsou připojeny na cílovém zařízení %(device)s, budou před zahájením procesu instalace odpojeny."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Neznámý souborový systém. Vaše zařízení bude nutné zformátovat."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepodporovaný systém souborů: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Neznámá výjimka GLib při pokusu o připojení zařízení: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nemohu připojit zařízení: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nenalezeny žádné body připojení"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Spouští se unmount_device pro '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Odpojuje se připojený souborový systém na '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Odpojuje se '%(udi)s' z '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Připojení %s existuje po odpojení"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Vytváří se oddíly na zařízení %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Aktualizace vlastností systémového diskového oddílu %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nepodporované zařízení  '%(device)s', prosím nahlaste chybu"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Snažím se pokračovat dál."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Ověřuji systém souborů..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Není možné změnit jmenovku svazku: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instaluji bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Nelze najít '%s' COM32 modul"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Odebírám %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s je bootovatelné"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nemohu najít oddíl"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formátuji %(device)s jako FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Nelze najít syslinux gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Čtení extrahované MBR z %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Resetuji hlavní bootovací záznam %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Zařízení je smyčka, přeskakuji resetování hlavního bootovacího záznamu"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Kalkuluji SHA1 %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronizuji data na disk..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Chyba při snímání zařízení"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nenalezeno žádné podporované zařízení."
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Ujistěte se, že váš USB disk je připojen a naformátován na systéme souborů FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepodporovaný systém souborů: %s\nProsím proveďte zálohu a naformátujte USB disk systémem souborů FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nemohu získat Win32_LogicalDisk; win32com výsledky"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nemohu nalézt"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -315,40 +315,48 @@ msgstr "Instalace kompletní! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalace Tails selhala"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Upozornění: Tento nástroj je nutné spustit jako Administrátor. Učiníte tak kliknutím pravým tlačítkem na ikonu a vyberte Vlastnosti. V záložce Kompatibilita vyberte možnost Spustit tento program jako správce."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Instalátor Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Instalace"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Připojte prosím USB flash disk nebo SD kartu velikosti alespoň %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -356,42 +364,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Zařízení "%(pretty_name)s" je moc malé pro instalaci Tails (je vyžadováno alespoň %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Obnovování verzí..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Verze obnoveny!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalace kompletní!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Instalace byla dokončena."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nemohu připojit zařízení"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -399,39 +407,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Stahování dokončeno!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Stahování selhalo: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Zkuste znovu zahájit stahování"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Vybraný soubor je nečitelný. Opravte jeho oprávnění nebo vyberte jiný soubor."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nemohu použít vybraný soubor. Zkuste přesunout ISO do kořenového adresáře vašeho disku (např. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s zvolen"
@@ -502,86 +519,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalace Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Instalace"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Nainstalujte Tails na novou USB klíčenku."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB klíčenka, na kterou instalujete, bude naformátována a všechna data budou ztracena."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Instalace klonováním"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/csb/csb.po b/csb/csb.po
index e511fa989..0554627e7 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Kashubian (http://www.transifex.com/otf/torproject/language/csb/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/cv/cv.po b/cv/cv.po
index 679e96d13..e4a8d58f0 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Chuvash (http://www.transifex.com/otf/torproject/language/cv/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/cy/cy.po b/cy/cy.po
index 661c34696..c86e0a4fb 100644
--- a/cy/cy.po
+++ b/cy/cy.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -103,179 +103,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Yn cyfrifo SHA1 %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -306,40 +306,48 @@ msgstr "Wedi cwblhau'r osodiad! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Rhybydd: Mae rhaid i'r teclyn yma cael ei rhedeg fel Gweinyddwr. I gwneud hyn, dde-pwyswch ar yr eicon ac agor Priodweddau. O dan Cyddweddoldeb, ticiwch y focs "Rhedeg yr program hon fel Gweinyddwr"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -347,42 +355,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Wedi cwblhau'r osodiad!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Methu esgyn y ddyfais"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -390,39 +398,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Wedi cwblhau'r lawrlwythiad!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -493,86 +510,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Gosod Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/da/da.po b/da/da.po
index c061068b1..cd7a08a28 100644
--- a/da/da.po
+++ b/da/da.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-15 23:13+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -112,179 +112,179 @@ msgstr "Kan ikke fjerne mappe fra tidligere LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Kan ikke finde enhed %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Kan ikke skrive til %(device)s, springer over."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Nogle partitioner på den valgte enhed %(device)s er i brug. De vil alle blive skubbet ud før installationen starter."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Ukendt filsystem. Din enhed skal måske formateres igen."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Filsystem understøttes ikke: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Ukendt GLib-undtagelse ved forsøg på at montere enhed: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Kunne ikke tilslutte enhed: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Fandt ingen tilslutningspunkter"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Starter afmontering for "%(device)s""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Afmonterer monterede filsystemer på "%(device)s""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Afmonterer "%(udi)s" på "%(device)s""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Tilslutning %s eksisterer efter frakobling"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitionerer enheden %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Opdaterer indstillingerne på system partitionen %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Enheden "%(device)s" understøttes ikke. Rapportér venligst en fejl."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Prøver at forsætte alligevel."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verificerer filsystem..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Kan ikke ændre drev-navn: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installerer opstartsindlæser..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Kunne ikke finde '%s' COM32-modulet"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Fjerner %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s er allerede i stand til at starte"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Kan ikke finde partition"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatterer %(device)s som FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Kunne ikke finde syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Læser udtrukket MBR fra %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Kunne ikke læse den udtrukne MBR fra %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Nulstiller Master Boot Record for %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Drevet er et loopback, springer nulstilling af MBR over"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Beregner SHA1 for %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synkroniserer data på disk..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Fejl ved undersøgelse af enhed"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Kunne ikke finde nogen understøttede enheder"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Vær sikker på at din USB-nøgle er tilsluttet og formateret med FAT-filsystemet"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Filsystem understøttes ikke: %s\nForetag venligst en sikkerhedskopi og formatér din USB-nøgle med FAT-filsystemet."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Kan ikke få Win32_LogicalDisk; win32com forespørgslen returnerede ingen resultater"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Kan ikke finde"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -315,40 +315,48 @@ msgstr "Installation færdig! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails installation mislykkedes!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Advarsel: Dette værktøj skal køres som en administrator. For dette, højreklik på ikonet og åbn egenskaberne. Under kompatibilitetsfanebladet afkrydses boksen »Kør dette program som en administrator«."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails-installationsprogram"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Opgrader"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Installer"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s enhed (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Ingen ISO-aftryk valgt"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Vælg venligst et Tails ISO-aftryk."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Der kunne ikke findes nogen egnet enhed til installation af Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Isæt venligst et USB-flash-drev eller SD-kort på mindst %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -356,42 +364,42 @@ msgid ""
 "different model."
 msgstr "USB-pennen "%(pretty_name)s" er konfigureret som ikke-flytbar af dens producent og Tails vil ikke kunne start fra den. Prøv venligst at installere en anden model."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Enheden "%(pretty_name)s" har ikke plads nok til at installere Tails (kræver mindst %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Der opstod fejl ved installation af Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Genopfrisker udgivelser..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Udgivelser opdateret!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installation færdig!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Installation blev fuldført."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Kan ikke tilslutte enhed"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Bekræft mål USB-pennen"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -399,39 +407,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s enhed (%(device)s)\n\nAl data på denne USB-pen vil gå tabt."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s enhed (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download udført!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Download fejlede: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Du kan prøve at genoptage din download"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Den valgte fil er ikke læsbar. Du kan enten ændre filtilladelserne eller vælge en anden fil."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Kan ikke bruge den valgte fil. Prøv i stedet at flytte din ISO til roden af dit drev (dvs. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s valgt"
@@ -502,86 +519,3 @@ msgstr "Mål USB-pen:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Geninstaller (slet al data)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "For at køre Tails-installationsprogrammet skal du bruge et ISO-aftryk som kan downloades fra Tails-webstedet: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Installer"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installer Tails på en ny USB-pen."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB-pennen som du installere på formateres og al data går tabt."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Opgrader"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Opgrader en Tails USB-pen til versionen af et ISO-aftryk."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Det krypterede vedvarende lager på Tails USB-pennen som du opgradere bevares."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Brug for hjælp? Læs <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edokumentationen</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Installer ved kloning"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Installer Tails på en anden USB-pen ved at kopiere Tails-systemet som du bruger på nuværende tidspunkt."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Det krypterede vedvarende lager på Tails USB-pennen som du bruger på nuværende tidspunkt kopieres ikke."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Opgrader ved kloning"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Opgrader en anden Tails USB-pen til den samme version af Tails som du bruger på nuværende tidspunkt."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Opgrader fra ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Opgrader en anden Tails USB-pen til versionen af et ISO-aftryk."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Brug for hjælp? Læs <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">dokumentationen</a>"
diff --git a/de/de.po b/de/de.po
index 6da05d8c9..4283e70d8 100644
--- a/de/de.po
+++ b/de/de.po
@@ -43,9 +43,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 18:40+0000\n"
-"Last-Translator: Ettore Atalan atalanttore@googlemail.com\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,179 +136,179 @@ msgstr "Ordner einer älteren Live-System-Version konnte nicht entfernt werden:
 msgid "Cannot find device %s"
 msgstr "Kann Gerät %s nicht finden"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Auf %(device)s kann nicht geschrieben werden. Überspringe."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Einige Partitionen des Ziellaufwerks %(device)s sind eingehängt. Sie werden ausgehängt, bevor die Installation beginnt."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Unbekanntes Dateisystem. Eventuell muss das Speichermedium neu formatiert werden."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nicht unterstütztes Dateisystem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Unbekannte GLib-Ausnahme beim Versuch das Gerät einzuhängen: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Speichermedium konnte nicht eingehängt werden: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Keine Einhängepunkte gefunden"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "unmount_device für »%(device)s«"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Eingehängtes Dateisystem auf %(device)s wird ausgehängt"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "'%(udi)s' auf '%(device)s' wird ausgehängt"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Mount %s existiert noch nach dem Aushängen"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Speichermedium %(device)s wird partitioniert"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Die Eigenschaften der Systempartition %(system_partition)s werden aktualisiert"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nicht unterstütztes Medium »%(device)s«, bitte melden Sie einen Fehler."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Es wird trotzdem versucht, fortzufahren."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Dateisystem wird überprüft …"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Datenträgerbeschreibung konnte nicht geändert werden: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Bootloader wird installiert …"
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "COM32-Modul '%s' konnte nicht gefunden werden"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Entferne %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s bereits bootfähig"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Partition konnte nicht gefunden werden"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s wird als FAT32 formatiert"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "gptmbr.bin von syslinux konne nicht gefunden werden"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Extrahierter MBR von %s wird gelesen"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Extrahierter MBR aus %(path)s konnte nicht gelesen werden"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Master-Boot-Record von %s wird zurückgesetzt"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Das Laufwerk ist ein Loopback, MBR zurücksetzen wird übersprungen"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "SHA-1-Summe von %s wird errechnet"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Daten auf dem Datenträger werden synchronisiert…"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Fehler beim Prüfen des Speichermediums"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Es wurde kein unterstütztes Speichermedium gefunden"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Stellen Sie sicher, dass Ihr USB-Medium eingesteckt und mit einem FAT-Dateisystem formatiert ist"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nicht unterstütztes Dateisystem: %s\nBitte erstellen Sie eine Datensicherung und formatieren Sie Ihren USB-Stick mit einem FAT-Dateisystem."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Win32_LogicalDisk konnte nicht ermittelt werden; der win32com-Aufruf lieferte keinerlei Resultate"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Kann nicht gefunden werden"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -339,40 +339,48 @@ msgstr "Installation abgeschlossen! (%s) "
 msgid "Tails installation failed!"
 msgstr "Tails-Installation fehlgeschlagen!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Warnung: Dieses Werkzeug muss mit Administrationsrechten ausgeführt werden. Um dies zu tun, klicken Sie mit der rechten Maustaste auf das Programmsymbol und öffnen Sie dort die Eigenschaften. Setzen Sie nun einen Haken bei »Programm als Administrator ausführen« im Reiter »Kompatibilität«."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails-Installationsprogramm"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Aktualisieren"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Installieren"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s Gerät (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Kein ISO-Abbild ausgewählt"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Bitte wählen Sie ein Tails-ISO-Abbild aus."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Es konnte kein passendes Gerät zur Installation von Tails gefunden werden"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Bitte stecken Sie ein USB-Flash-Laufwerk oder eine SD-Karte mit mindestens %0.1f GB ein."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -380,42 +388,42 @@ msgid ""
 "different model."
 msgstr "Der USB-Stick "%(pretty_name)s" wurde vom Herrsteller als nicht entfernbar konfiguriert und somit würde Tails davon nicht starten. Bitte versuch es auf einem anderen Moddel zu installiern."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Der Datenträger "%(pretty_name)s" ist zu klein, um Tails darauf zu installieren (mindestens %(size)s GB werden benötigt)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Bei der Installation von Tails ist ein Fehler aufgetreten"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Veröffentlichungen werden aktualisiert …"
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Veröffentlichungen wurden aktualisiert!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installation abgeschlossen!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Installation wurde abgeschlossen."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Speichermedium kann nicht einhängt werden"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Bestätigen Sie den Ziel-USB-Stick"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -423,39 +431,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s Gerät (%(device)s)\n\nAlle Daten auf diesem USB-Stick gehen verloren."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s Gerät (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Herunterladen abgeschlossen!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Herunterladen fehlgeschlagen:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Sie können versuchen, das Herunterladen fortzusetzen"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte korrigieren Sie die Berechtigungen oder wählen Sie eine andere Datei aus."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Die ausgewählte Datei kann nicht verwendet werden. Vielleicht haben Sie mehr Glück, wenn Sie das ISO-Abbild in das Wurzelverzeichnis Ihres Laufwerkes verschieben."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ausgewählt"
@@ -526,86 +543,3 @@ msgstr "Ziel-USB-Stick:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Neu installieren (alle Daten löschen)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails installieren"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Um das Tails Installationsprogramm zu starten benötigst du ein ISO Abbild welches du von der Tails Internetseite laden kannst: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Installieren"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installieren Sie Tails auf einem neuen USB-Stick."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• Der USB Stick auf den du installieren willst wird formatiert und alle Daten werden verloren gehen."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Aktualisieren"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Einen Tails USB Stick auf die Version eines ISO Abbildes aktualisieren."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "Der verschlüsselte dauerhafte Speicher des Tails USB-Sticks, den du upgradest, ist in Benutzung."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Brauchen Sie Hilfe? Lesen Sie die <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3EDokumentation</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Durch Klonen installieren"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "Installiere Tails auf einem anderen USB-Stick indem du das aktuell genutzte Tails System kopierst."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "Der verschlüsselte, dauerhafte Speicher des Tails USB-Sticks, den du gerade nutzt, wurde nicht kopiert."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Durch Klonen aktualisieren"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "Upgrade einen weiteren Tails USB-Stick auf dieselbe Version von Tails die du gerade nutzt."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Von ISO aktualisieren"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "Upgrade einen weiteren Tails USB-Stick auf die Version eines ISO-Images."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Brauchen Sie Hilfe? Lesen Sie die <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">Dokumentation</a>"
diff --git a/dz/dz.po b/dz/dz.po
index 4f258dff7..86b3c0733 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Dzongkha (http://www.transifex.com/otf/torproject/language/dz/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/el/el.po b/el/el.po
index a3c1ffeab..1666886ad 100644
--- a/el/el.po
+++ b/el/el.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -116,179 +116,179 @@ msgstr "Αδυναμία απομάκρυνσης καταλόγου από πρ
 msgid "Cannot find device %s"
 msgstr "Αδυναμία εύρεσης συσκευής %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Αδυναμία εγγραφής στο %(device)s, παράκαμψη."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Κάποιες κατατμήσεις του δίσκου %(device)s είναι προσαρτημένες. Θα αποσυνδεθούν πριν ξεκινήσει η διαδικασία εγκατάστασης."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Άγνωστο σύστημα αρχείων. Η συσκευή μπορεί να χρειάζεται διαμόρφωση."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Μη υποστηριζόμενο σύστημα αρχείων: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Αδυναμία προσάρτησης συσκευής: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Δεν βρέθηκαν σημεία προσάρτησης"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Εισαγωγή  unmount_device για '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Αποπροσάρτηση προσαρτημένων συστημάτων αρχείων σε '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Αποπροσάρτηση '%(udi)s' σε '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Η προσάρτηση %s παραμένει μετά την αποπροσάρτηση"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Κατάτμηση συσκευής %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Ενημέρωση ιδιοτήτων της κατάτμησης συστήματος %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Μη υποστηριζόμενη συσκευή '%(device)s', παρακαλούμε να αναφέρετε το σφάλμα."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Προσπάθεια να συνεχίσετε ούτως ή άλλως."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Έλεγχος συστήματος αρχείων..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Αδυναμία αλλαγής της ετικέτας του τόμου: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Εγκατάσταση φορτωτή εκκίνησης..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Απομακρύνονται τα %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s ήδη επανεκκινήσιμο"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Αδυναμία εντοπισμού κατάτμησης"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Η συσκευή %(device)s διαμορφώνεται ως FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Επαναφορά Master Boot Record στο %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Η συσκευή είναι loopback. Παρακάμπτεται η επαναφορά του MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Υπολογισμός του SHA1 για το %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Γίνεται συγχρονισμός των δεδομένων δίσκου..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Σφάλμα κατά τον έλεγχο της συσκευής"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Δεν βρέθηκε συμβατή συσκευή"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Σιγουρευτείτε ότι το USB stick σας είναι συνδεδεμένο και διαμορφωμένο σε σύστημα αρχείων FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Μη υποστηριζόμενο σύστημα αρχείων: %s\nΠαρακαλώ δημιουργείστε ένα αντίγραφο ασφαλείας και μορφοποιήστε τη συσκευή USB σε σύστημα αρχείων FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Αδυναμία λήψης του Win32_LogicalDisk· η αναζήτηση του win32com δεν απέδωσε αποτελέσματα"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Αδυναμία εύρεσης"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -319,40 +319,48 @@ msgstr "Η εγκατάσταση ολοκληρώθηκε! (%s)"
 msgid "Tails installation failed!"
 msgstr "Η εγκατάσταση του Tails απέτυχε!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Προειδοποίηση: Αυτό το εργαλείο πρέπει να εκτελεστεί ως Διαχειριστής. Για να το κάνετε αυτό, κάντε δεξί κλικ πάνω στο εικονίδιο και ανοίξτε τις Ιδιότητες.  Στην καρτέλα Συμβατότητας, ενεργοποιήστε το κουτάκι "Εκτέλεσε αυτό το πρόγραμμα ως διαχειριστής"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Πρόγραμμα εγκατάστασης Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Αναβάθμιση"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Εγκατάσταση"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Δε βρέθηκε συσκευή που να πληρεί τις προϋποθέσεις για την εγκατάσταση του Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Παρακαλώ εισάγετε μονάδα δίσκου usb ή κάρτα SD μεγέθους τουλάχιστον %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -360,42 +368,42 @@ msgid ""
 "different model."
 msgstr "Αυτή η μονάδα δίσκου USB "%(pretty_name)s" είναι ρυθμισμένο ως μη αφαιρέσιμο από τον κατασκευαστή του και το Tails θα αποτύχει να εκκινηθεί σε αυτό. Παρακαλώ προσπαθήστε να εγκαταστήσετε σε διαφορετικό μοντέλο."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Η συσκευή  "%(pretty_name)s" είναι πολύ μικρή για να εγκαταστήσετε το Tails (απαιτούνται τουλάχιστον %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Προέκυψε σφάλμα κατά την εγκατάσταση του Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Ανανέωση εκδόσεων..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Η ανανεωση πετυχε!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Η εγκατάσταση ολοκληρώθηκε!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Η εγκατάσταση έχει ήδη ολοκληρωθεί"
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Αδυναμία προσάρτησης συσκευής"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -403,39 +411,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Η λήψη ολοκληρώθηκε!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Η λήψη απέτυχε:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Μπορείτε να δοκιμάσετε να συνεχίσετε τη λήψη"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Το συγκεκριμένο αρχείο δεν μπορεί να αναγνωσθεί. Παρακαλώ διορθώστε τα δικαιώματά του ή διαλέξτε άλλο αρχείο."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Αδυναμία χρήσης του επιλεγμένου αρχείου. Μπορεί να έχετε καλύτερη τύχη αν μετακινήσετε το ISO στη ριζα του δίσκου σας (πχ C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "επιλέχθηκαν %(filename)s"
@@ -506,86 +523,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Εγκατάσταση του Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Για την εκκίνηση του προγράμματος εγκατάστασης του Tails χρειάζεστε μία εικόνα ISO που μπορεί να ληφθεί από τον ιστότοπο του Tails: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Εγκατάσταση"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Εγκατάσταση του Tails σε μία νέα μονάδα δίσκου USB."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "Η μονάδα δίσκου USB στην οποία γίνεται εγκατάσταση είναι διαμορφωμένη και όλα τα δεδομένα έχουν χαθεί."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Αναβάθμιση"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Αναβάθμιση μίας μονάδας δίσκου USB Tails στην έκδοση μίας εικόνας ISO."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Χρειάζεστε βοήθεια? Διαβάστε τα <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3E%CE%B1%CF%81%CF... βοήθειας</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "Εγκατάσταση του Tails σε άλλη συσκευή USB αντιγράφοντας το σύστημα Tails που χρησιμοποιείτε."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "Αναβάθμιση μιας άλλης συσκευής USB Tails στην έκδοση Tails που χρησιμοποιείτε"
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Αναβάθμιση από εικόνα ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "Αναβάθμιση μιας άλλης συσκευής USB Tails στην έκδοση ενός αρχείου εικόνας ISO"
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Χρειάζεστε βοήθεια? Διαβάστε τα <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">αρχεία βοήθειας</a>"
diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index 53acbe30a..6ccc8ffa8 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -107,179 +107,179 @@ msgstr "Unable to remove directory from previous LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Cannot find device %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Unable to write on %(device)s, skipping."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Some partitions of the target device %(device)s are mounted. They will be unmounted before starting the installation process."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Unknown filesystem.  Your device may need to be reformatted."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Unsupported filesystem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Unable to mount device: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "No mount points found"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Entering unmount_device for '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Unmounting mounted filesystems on '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Unmounting '%(udi)s' on '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Mount %s exists after unmounting"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitioning device %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Updating properties of system partition %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Unsupported device '%(device)s', please report a bug."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Trying to continue anyway."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verifying filesystem..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Unable to change volume label: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installing bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Removing %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s already bootable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Unable to find partition"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatting %(device)s as FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Resetting Master Boot Record of %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Drive is a loopback, skipping MBR reset"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculating the SHA1 of %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronizing data on disk..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Error probing device"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Unable to find any supported device"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Make sure your USB key is plugged in and formatted with the FAT filesystem"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Unsupported filesystem: %s\nPlease backup and format your USB key with the FAT filesystem."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Unable to get Win32_LogicalDisk; win32com query did not return any results"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Cannot find"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -310,40 +310,48 @@ msgstr "Installation complete! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Warning: This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the "Run this program as an administrator" box."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -351,42 +359,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "The device "%(pretty_name)s" is too small to install Tails (at least %(size)s GB is required)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Refreshing releases..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Releases updated!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installation complete!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Unable to mount device"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -394,39 +402,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download complete!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Download failed: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "You can try again to resume your download"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "The selected file is unreadable. Please fix its permissions or select another file."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Unable to use the selected file.  You may have better luck if you move your ISO to the root of your drive (ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s selected"
@@ -497,86 +514,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Install Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/eo/eo.po b/eo/eo.po
index 79d63200d..fcbbf4c4f 100644
--- a/eo/eo.po
+++ b/eo/eo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Provante daŭri malgraŭe."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Kalkulante SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s elektita"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalu Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/es/es.po b/es/es.po
index 0ecabb25c..6eae0ce52 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
 # Adrián Sandí asandi.sagot@gmail.com, 2013
 # dark_yoshi angelargi@yahoo.es, 2014
 # BL tresemes3@gmail.com, 2014
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 15:56+0000\n"
-"Last-Translator: strel\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -115,179 +115,179 @@ msgstr "No se pudo eliminar la carpeta del anterior sistema operativo autoarraca
 msgid "Cannot find device %s"
 msgstr "No se pudo encontrar el dispositivo %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "No se pudo escribir en %(device)s, omitiendo... "
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algunas particiones del dispositivo destino %(device)s están montadas. Serán desmontadas antes de iniciar el proceso de instalación."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistema de ficheros desconocido. Tu dispositivo podría tener que ser formateado."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "No se admite el sistema de archivos: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Excepción GLib desconocida mientras se intentaba montar el dispositivo %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "No se pudo montar el dispositivo: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "No se encontraron puntos de montaje"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Ejecutando unmount_device para '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Desmontando los sistemas de ficheros montados sobre '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Desmontando '%(udi)s' en '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "El punto de montaje %s sigue existiendo tras desmontar "
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Particionando el dispositivo %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Actualizando las propiedades de la partición de sistema %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Dispositivo '%(device)s' no soportado, por favor reporte el fallo."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Tratando de continuar de cualquier manera."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verificando el sistema de ficheros... "
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "No se pudo cambiar la etiqueta del volumen: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instalando gestor de arranque (bootloader)... "
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "No se pudo encontrar el módulo '%s' COM32"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Eliminando %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s ya es arrancable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Incapaz de encontrar la partición"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formateando %(device)s como FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "No se pudo encontrar gptmbr.bin de syslinux"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Leyendo extractos MBR desde %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "No se pudo leer el extracto MBR desde %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Restableciendo Master Boot Record de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restablecimiento del MBR..."
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculando la suma de comprobación SHA1 de %s "
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sincronizando datos en el disco... "
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Error probando el dispositivo "
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "No se pudo localizar dispositivo soportado alguno."
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Asegúrate de que tu memoria USB está conectada, y formateada con el sistema de ficheros FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Sistema de ficheros no soportado: %s\nPor favor, haz una copia de respaldo y formatea tu memoria USB con el sistema de ficheros FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "No fue posible obtener Win32_LogicalDisk; la petición win32com no devolvió resultados"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "No se pudo encontrar"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -318,40 +318,48 @@ msgstr "¡Instalación completa! (%s)"
 msgid "Tails installation failed!"
 msgstr "Falló la instalación de Tails"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Advertencia: Esta herramienta debe ser ejecutada como Administrador. Para hacer esto, haz clic con el botón secundario del ratón sobre el icono, y abre las Propiedades. Bajo la pestaña Compatibilidad marca la casilla "Ejecutar este programa como un administrador"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Instalador de Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Actualización"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Instalar"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "Dispositivo %(size)s %(vendor)s %(model)s (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "No se seleccionó imagen ISO"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Por favor, seleccione una imagen ISO de Tails."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "No se puede encontrar ningún device apto para instalar Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Por favor, inserte una memoria flash USB o tarjeta SD de al menos %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -359,42 +367,42 @@ msgid ""
 "different model."
 msgstr "La memoria USB "%(pretty_name)s" está configurada como no extraíble por su fabricante, y Tails no podrá iniciarse desde ella. Por favor, pruebe a instalar en un modelo distinto."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "El dispositivo "%(pretty_name)s" es demasiado pequeño para instalar Tails (se requieren al menos %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Ha ocurrido un error mientras se instalaba Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Comprobando nuevas versiones..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "¡Nuevas versiones actualizadas!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "¡Instalación completa!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Se ha completado la instalación"
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "No se pudo montar el dispositivo"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Confirmar la memoria USB de destino"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -402,39 +410,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "Dispositivo %(size)s %(vendor)s %(model)s (%(device)s)\n\nTodos los datos en esta memoria USB se perderán."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "Dispositivo %(vendor)s %(model)s (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "¡Descarga completa!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Fallo de la descarga: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Puedes intentar continuar con la descarga."
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "El fichero seleccionado no se puede leer. Ajusta tus permisos o selecciona otro fichero."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "No se pudo utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (ej. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seleccionado(s)"
@@ -505,86 +522,3 @@ msgstr "Memoria USB de destino:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Reinstalar (borra todos los datos) "
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalar Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Para ejecutar el instalador de Tails necesitas una imagen ISO que te puedes bajar del sitio web de Tails: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Instalar"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "Instalar Tails en un nuevo dispositivo USB"
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "El USB  donde vas a instalar se va a formatear y se perderán todos los datos"
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Actualización"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "Actualización del USB de Tails a la versión de una imagen ISO."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Se preserva el almacenamiento cifrado persistente de la memoria USB de Tails que actualices,"
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "¿Necesitas ayuda? Lee la <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentaci%C3%...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Instalar mediante clonación"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Instala Tails en otra memoria USB copiando el sistema Tails que estás usando actualmente."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• El almacenamiento cifrado persistente de la memoria USB de Tails que estás usando actualmente no se copia."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Actualizar mediante clonado"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Actualiza otra memoria USB de Tails a la misma versión de Tails que estás usando actualmente."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Actualizar desde la ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Actualiza otra memoria USB de Tails a la versión de la imagen ISO."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "¿Necesitas ayuda? Lee la <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentación</a>"
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 3f61c18fe..fa7ef0511 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 16:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -110,179 +110,179 @@ msgstr "No se pudieron remover directorios del LiveOS anterior: %(message)s"
 msgid "Cannot find device %s"
 msgstr "No se encontró el dispositivo %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "No se puede escribir en la unidad %(device)s, omitiendo."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algunas particiones del dispositivo de destino %(device)s están montadas y serán desmontadas antes de comenzar con la instalación."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistema de archivos desconocido. Su dispositivo puede necesitar ser reformateado."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistema de archivos no soportado: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "No se pudo montar el dispositivo: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "No se encontraron puntos de montaje"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Ejecutando unmount_device para '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Desmontando sistema de archivos de '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Desmontando '%(udi)s' en '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "El punto de montaje %s sigue existiendo después del desmontado"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Particionando dispositivo %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Actualizando las propiedades de la partición %(system_partition)s del sistema"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "El dispositivo '%(device)s' no está soportado, por favor envíe un informe de fallos"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Intentando continuar de todos modos."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verificando el sistema de archivos..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "No se pudo cambiar la etiqueta del volumen: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instalando el gestor de arranque..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "No se pudo encontrar el módulo '%s' COM32"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Removiendo %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s es arrancable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "No se encontró la partición"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formateando %(device)s como FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Leyendo el MBR extraído de %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "No se pudo leer el MBR extraido de %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Restableciendo Registro de Arranque Maestro de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "La unidad es virtual, omitiendo el restablecimiento del MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculando el SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sincronizando datos en disco..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Error al examinar el dispositivo"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "No se encontraron dispositivos soportados"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Asegúrese de que su dispositivo USB está conectado y formateado con un sistema de archivos FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Sistema de archivos no soportado: %s\nHaga un respaldo de los datos y formatee su dispositivo USB con un sistema de archivos FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "No se pudo obtener Win32_LogicalDisk; la consulta a win32com no retornó ningún resultado"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "No se encontró"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -313,40 +313,48 @@ msgstr "Instalación completa! (%s)"
 msgid "Tails installation failed!"
 msgstr "¡Falló la instalación de Tails!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Advertencia: Esta herramienta necesita ser ejecutada como Administrador. Para hacer esto, haga clic derecho sobre el icono, y abra las Propiedades. En la pestaña Compatibilidad, marque el recuadro "Ejecutar este programa como un administrador"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Instalador de Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Actualizar"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Instalar"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Por favor conecta una memoria USB o tarjeta SD de al menos %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -354,42 +362,42 @@ msgid ""
 "different model."
 msgstr "La memoria USB "%(pretty_name)s" está configurada como no-removible por su fabricante y Tails fallará al iniciar desde ella. Por favor intenta instalando en un modelo distinto."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "El dispositivo  "%(pretty_name)s" tiene poca capacidad para instalar Tails( se necesita al menos %(size)s GB )."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Ha ocurrido un error mientras se instalaba Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Comprobando nuevas versiones..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "¡Versiones actualizadas!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "¡Instalación completa!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Se ha completado la instalación."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "No se pudo montar el dispositivo"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -397,39 +405,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "¡Descarga completa!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Descarga fallida:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Puedes intentar de nuevo para reanudar tu descarga"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "No se pudo leer el archivo seleccionado. Por favor cambie los permisos o seleccione otro archivo."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Imposible usar el archivo seleccionado. Quizás tenga mejor suerte si mueve su ISO a la carpeta de raíz de la unidad (ej: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seleccionado"
@@ -500,86 +517,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalar Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Para ejecutar el Instalador de Tails necesitas una imagen ISO que puede ser descargada desde el sitio web de Tails: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Instalar"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Instalar Tails en una nueva memoria USB."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Actualizar"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "¿Necesitas ayuda? Lee la <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentaci%C3%...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Instalación por clonación"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Actualizar desde ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "¿Necesitas ayuda? Lee la <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentación</a>"
diff --git a/es_CL/es_CL.po b/es_CL/es_CL.po
index d50050746..22b050c2a 100644
--- a/es_CL/es_CL.po
+++ b/es_CL/es_CL.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/otf/torproject/language/es_CL/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/es_CO/es_CO.po b/es_CO/es_CO.po
index 219aa1aea..b787a1828 100644
--- a/es_CO/es_CO.po
+++ b/es_CO/es_CO.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 20:51+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/otf/torproject/language/es_CO/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -103,179 +103,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -306,40 +306,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -347,42 +355,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -390,39 +398,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seleccionado"
@@ -493,86 +510,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po
index 5c3891fcc..4a40fe6ee 100644
--- a/es_MX/es_MX.po
+++ b/es_MX/es_MX.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-20 00:56+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "No se encuentra el dispositivo %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Introduciendo unmount_device para '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s ya es reiniciable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculando el SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Error al explorar el dispositivo"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "No se pudo encontrar"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Descarga completa!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "La descarga ha fallado:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seleccionado"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/et/et.po b/et/et.po
index 97240e180..a9841418d 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 18:52+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/eu/eu.po b/eu/eu.po
index b7df77a5c..b1343353b 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:13+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -108,179 +108,179 @@ msgstr "Ezin da aurreko LiveOSaren direktorioa kendu: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Ezin da %s gailua aurkitu"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Ezin da %(device)s gailuan idatzi, saltatzen"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Fitxategi sistema ezezaguna. Zure gailua agian berriro formateatzea behar izan dezake."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Onartu gabeko fitxategi sistema: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Ezin da gailua muntatu: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Muntatze punturik ez da aurkitu"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "%(device)s desmuntatzen"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "%s muntaketa existitzen da desmuntatu ondoren"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "%(device)s gailuaren partizioa egiten"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Sistema partizioaren propietateak eguneratzen %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "'%(device)s' gailua ez da onartzen, mesedez, eman errorearen berri."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Aurrera jarraitzeko saiatutzen edonola."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Fitxategi sistema egiaztatzen..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Ezin da bolumenaren etiketa aldatu: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Abio-kargatzailea instalatzen..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)s kentzen"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s dagoeneko abiarazgarria da"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Ezin da partizioa aurkitu"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s FAT32 bezala formateatzen"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "%s ren abio-erregistro nagusia (MBR) berrezartzen"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Gailua atzera-begizta bat da, MBRa berrezartzea saltatzen"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "%s ren SHA1 kalkulatzen"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Datuak diskoan sinkronizatzen..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Akatsa gailua frogatzerakoan"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Ezin da onartutako gailurik aurkitu"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Egiaztatu zure USB gailua konektatuta dagoela eta FAT fitxategi sistemarekin formateatuta."
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Onartu gabeko fitxategi sistema: %s\nMesedez babeskopia bat egin eta formateatu ezazu zure USB gailua FAT fitxategi sistemarekin."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Ezin da Win32_LogicalDisk lortu; win32com eskaerak ez du erantzunik itzuli"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Ezin da aurkitu"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -311,40 +311,48 @@ msgstr "Instalazioa burutu da! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Abisua: Tresna hau Administratzaile bezala exekutatu behar da. Hau egiteko, sakatu eskuinarekin ikonoan eta ireki Propietateak. Bateragarritasuna fitxan, markatu "Programa hau administratzale bezala exekutatu" kutxa."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -352,42 +360,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Argitalpenak freskatzen..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Argitalpenak eguneratuta!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalazioa burutu da!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Ezin da gailua muntatu"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -395,39 +403,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Deskarga burutu da!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Deskargak huts egin du:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Deskarga jarraitzen saia zaitezke berriz"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Aukeratutako fitxategia irakurtezina da. Mesedez zuzendu bere baimenak edo beste fitxategi bat aukeratu.  "
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Hautatutako fitxategia ezin da erabili. Sorte gehiago izan dezakezu zure ISOa zure gailuaren oinarrira mugitzen baduzu (adib: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s hautatua"
@@ -498,86 +515,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails instalatu"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/fa/fa.po b/fa/fa.po
index 7a1027376..3c54c3815 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -115,179 +115,179 @@ msgstr "قادر به نصب حافظه نیست: %(message)s"
 msgid "Cannot find device %s"
 msgstr "وسیله ی %s یافت نشد"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "خطا در نوشتن بر روی دستگاه  %(device)s. این مرحله را جا می‌اندازم."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "بعضی از پارتیشن های موجود بر روی دستگاه %(device)s فعال و راه اندازی شدند. آن ها قبل از شروع مراحل نصب غیر فعال می شوند."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "نوع فايل سيستم ناشناخته است. دستگاه شما ممكن است نياز به فرمت مجدد داشته باشد."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "فایل سیستم های غیرقابل پشتیبانی: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "خطای GLib ناشناخته در هنگام تلاش برای سوار کردن دستگاه: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "قادر به نصب حافظه نیست: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "هيچ نقطه بازگذاري يافت نشد"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "وارد کردن دستگاه هاي وصل نشده براي '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "حذف فایل های سیستمی از روی '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "جداکردن '%(udi)s' روی '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "نصب %s بعد از حذف موجود است"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "در حال پاتیشن‌بندیِ %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "در حال به روز رسانی اطلاعات پارتیشن سیستمی %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "دستگاه پشتیبانی نشده '%(device)s'، لطفا یک باگ را گزارش دهید"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "تلاش برای ادامه دادن در هر صورت."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "تایید فایل سیستم..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "قادر به تغییر برچسب حافظه نیست: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "نصب بوت لودر..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "ماژول '%s' COM32 پیدا نشد"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "برداشتن %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s از پیش قابل راه‌اندازی"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "قادر به پیدا کردن پارتیشن نیست."
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "فرمت کردن %(device)s به صورت FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "بازنشانی رکورد راه‌اندازی اصلی از %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "درایو از نوع Loopback است. راه‌اندازی دوباره "رکورد راه‌اندازی اصلی" MBR را رد کنید."
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "محاسبه SHA1 از %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "هماهنگ سازی داده‌ها بر روی دیسک..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "دستگاه جستجوی خطا"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "هیچ دستگاهی که پشتیبانی شود یافت نشد"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "مطمئن شوید یو اس بی شما متصل شده و با فایل سیستم FAT قالب بندی شده است."
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "فایل سیستم پشتیبانی نشده: %s\nلطفا از وسیله یو‌اس‌بی خود پشتیبانی گرفته و آن را با فایل سیستم FAT قالب بندی کنید."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "قادر به دسترسی به Win32_LogicalDisk نیست. فراخواندن win32com هیچ نتیجه‌ای را برگردان نمی‌کند"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "یافت نمی‌شود"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -318,40 +318,48 @@ msgstr "عمليات نصب به پايان رسيد! (%s)"
 msgid "Tails installation failed!"
 msgstr "نصب تیلز ناموفق بود!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "هشدار: اين ابزار نياز به اجرا شدن توسط مدير سيستم دارد. براي انجام اين كار، بر روي آيكون راست كليك كرده، سپس Properties را انتخاب كرده و از لبه Compatibility، گزينه Run the program as an administrator را انتخاب كنيد."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "نصب کننده تیلز"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "ارتقاء"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "نصب"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -359,42 +367,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "فضای دستگاه "%(pretty_name)s" برای نصب کم است (حداقل %(size)s گیگابایت فضا لازم است)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "در نصب تیلز یک خطا رخ داد"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "بازنگری انتشار‌ها…"
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "انتشارها بروزرسانی شدند!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "عمليات نصب به پايان رسيد!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "نصب تکمیل شد."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "فادر به بارگذاري دستگاه نيست."
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -402,39 +410,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "دانلود کامل شد!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "دانلود نا موفق:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "بار دیگر می توانید برای ادامه دانلود سعی کنید"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "فایل انتخاب‌شده قابل خواندن نیست. لطفا اجازه دسترسی به آن را اصلاح کنید یا فایل دیگری را انتخاب کنید"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "قادر به استفاده از فايل انتخاب شده نيست. اگر فايل ايزو را به ريشه درايو خود (مثلاً C) منتقل كنيد ممكن است شانس بيتشري داشته باشيد."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s انتخاب شده"
@@ -505,86 +522,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "نصب مسیرها"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "نصب"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• نصب تیلز روی یک دستگاه USB جدید"
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "ارتقاء"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "به کمک نیاز دارید؟ <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3E%D9%85%D8%B3%D8...</a> را بخوانید"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "ارتقاء از ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "به کمک نیاز دارید؟ <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html"> اسناد</a> را بخوانید"
diff --git a/fi/fi.po b/fi/fi.po
index 977835284..2c666e198 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -110,179 +110,179 @@ msgstr "Edellisen Live-käyttöjärjestelmän hakemistoa ei voi poistaa: %(messa
 msgid "Cannot find device %s"
 msgstr "Laitetta %s ei löydy"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Laitteelle %(device)s ei voi kirjoittaa: vaihe ohitetaan."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Jotkut laitteen %(device)s osiot on liitetty. Osiot irrotetaan ennen kuin asennus alkaa."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Tuntematon tiedostojärjestelmä. Laitteesi on ehkä alustettava uudelleen."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Tiedostojärjestelmä, jota ei tueta: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Laitteen liittäminen epäonnistui: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Liitoskohtia ei löytynyt"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Suoritetaan unmount_device laitteelle ’%(device)s’"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Irrotetaan liitetty tiedostojärjestelmä laitteelta ’%(device)s’"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Irrotetaan ’%(udi)s’ laitteelta ’%(device)s’"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Irrotettu liitoskohta %s on vielä olemassa"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Osioidaan laitetta %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Päivitetään järjestelmäosion %(system_partition)s ominaisuuksia"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Laitetta ’%(device)s’ ei tueta, ilmoita virheestä."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Yritetään silti jatkaa."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Tarkistetaan tiedostojärjestelmää..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Taltion nimiön muuttaminen epäonnistui: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Asennetaan alkulatausohjelma..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Poistetaan %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s on jo käynnistettävä"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Osiota ei löydy"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Alustetaan %(device)s FAT32:lla."
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Palautetaan %s:n Master-käynnistystietue"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Levy on loopback-laite: ohitetaan MBR:n palautus"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Lasketaan %s:n SHA1-tarkistussummaa"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synkronoidaan levyn tiedot..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Laitteen etsimisessä virhe"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Tuettua laitetta ei löydy"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Varmista että USB-tikku on kiinnitetty ja että sen tiedostojärjestelmä on FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Tiedostojärjestelmää ei tueta: %s\nTee varmuuskopiot ja alusta USB-tikku FAT-tiedostojärjestelmällä."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Win32_LogicalDisk ei ole saatavissa; win32com -kysely ei tuottanut tuloksia"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Ei voida löytää"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -313,40 +313,48 @@ msgstr "Asennus on valmis! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Varoitus: Ohjelma on ajettava järjestelmänvalvojana. Tämä onnistuu, kun napsautat kuvaketta oikealla hiirenpainikkeella ja valitset Ominaisuudet. Rastita Yhteensopivuus-välilehdestä kohta "Suorita ohjelma järjestelmänvalvojana"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -354,42 +362,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Laitteen "%(pretty_name)s" tallennustila ei riitä Tails:n asentamiseen (asennukseen vaaditaan vähintään %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Päivitetään julkaisuja..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Julkaisut päivitetty!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Asennus on valmis!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Laitteen liittäminen epäonnistui"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -397,39 +405,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Lataus on valmis!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Lataus epäonnistui:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Voit yrittää jatkaa latausta"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Valittu tiedosto ei ole luettavissa. Korjaa käyttöoikeudet tai valitse toinen tiedosto."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Valittua tiedostoa ei voitu käyttää. Tämä saattaa onnistua paremmin, jos siirrät ISOn aseman juurihakemistoon (esim. C:\)."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s valittu"
@@ -500,86 +517,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Asenna Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/fil/fil.po b/fil/fil.po
index a336ed85d..f4e0b30f9 100644
--- a/fil/fil.po
+++ b/fil/fil.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Filipino (http://www.transifex.com/otf/torproject/language/fil/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Hindi mahanap ang device %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Walang mount points na mahanap"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Sinusubukan pa ring maghanap."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Ini-install ang bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s ito ay bootable na"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Hindi mahanap ang ibang sumusuportang device"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Siguraduhin na ang USB key ay naksaksak at naka format sa FAT filesystem"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Hindi mahanap"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Ang installation ay kumpleto na! "
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Ang download ay tapos na! "
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Ang download ay pumalya. "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Maaari mong subukan ulit para bumalik ang iyong download"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Ang piniling file ay hindi mabasa. Ayusin ang mga permisyon o pumili ng ibang file. "
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Hindi magamit ang piniling file. Baka ikaw ay swetehin kung ililipat mo ang ISO mo sa root ng iyong device (ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ang napili"
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "I-install ang Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/fo/fo.po b/fo/fo.po
index a5fc7a6f1..bfb5b2ab1 100644
--- a/fo/fo.po
+++ b/fo/fo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Faroese (http://www.transifex.com/otf/torproject/language/fo/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s kann longu startast"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s valt"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/fr/fr.po b/fr/fr.po
index 9ede73b8c..2c908136b 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -27,9 +27,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 18:46+0000\n"
-"Last-Translator: French language coordinator french.coordinator@rbox.me\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -120,179 +120,179 @@ msgstr "Impossible d'enlever le répertoire du SE autonome précédent : %(messa
 msgid "Cannot find device %s"
 msgstr "Le périphérique %s est introuvable"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Impossible d'écrire sur %(device)s, passage à l'étape suivante."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Certaines partitions du périphérique cible %(device)s sont montées. Elles seront démontées avant de démarrer le processus d'installation."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Le système de fichiers est inconnu. Il est possible qu'il faille reformater votre périphérique."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Système de fichiers non pris en charge : %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Exception GLib inconnue en tentant de monter le périphérique : %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Impossible de monter le périphérique : %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Aucun point de montage n'a été trouvé"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Saisie de unmount_device pour « %(device)s »"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Démontage des systèmes de fichiers montés sur « %(device)s »"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Démontage de « %(udi)s » sur « %(device)s »"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Le montage %s existe après démontage"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitionnement du périphérique %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Mise à jour des propriétés de la partition système %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Le périphérique « %(device)s » n'est pas pris en charge, veuillez signaler le bogue."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Nous tentons de continuer quand même."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Vérification du système de fichiers..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Impossible de changer l'étiquette du volume : %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installation du chargeur de démarrage..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Impossible de trouver le module COM32 « %s »"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Suppression de %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s est déjà amorçable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Impossible de trouver la partition"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatage de %(device)s en FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Impossible de trouver gptmbr.bin de SYSLYNUX"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lecture de l'enregistrement d'amorçage maître extrait de %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Impossible de lire l'enregistrement d'amorçage maître extrait de %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Réinitialisation de l'enregistrement d'amorçage maître de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Le périphérique est une boucle avec retour, omission de la réinitialisation de l'enregistrement d'amorçage maître"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calcul du SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronisation des données sur le disque..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Erreur de sondage du périphérique"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Aucun périphérique pris en charge n'a été trouvé"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Assurez-vous que votre clé USB est branchée et formatée avec le système de fichiers FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Système de fichiers non pris en charge : %s\nVeuillez sauvegarder votre clé USB et la formater avec le système de fichiers FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Impossible d'obtenir Win32_LogicalDisk ; la requête win32com n'a retourné aucun résultat."
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Introuvable"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -323,40 +323,48 @@ msgstr "L'installation est terminée ! (%s)"
 msgid "Tails installation failed!"
 msgstr "L'installation de Tails a échoué !"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Avertissement : cet outil doit être exécuté en tant qu'administrateur. Pour ce faire, cliquer sur l'icône et ouvrir les Propriétés. Sous l'onglet Compatibilité, cocher « Exécuter ce programme en tant qu'administrateur »."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Programme d'installation Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Mettre à niveau"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Installer"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s périphérique (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Aucune image ISO n'a été sélectionnée"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Veuillez sélectionner une image ISO de Tails."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Aucun périphérique compatible n'a été trouvé pour installer Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Veuillez connecter une clé USB ou une carte SD d'au moins %0.1f Go."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -364,42 +372,42 @@ msgid ""
 "different model."
 msgstr "La clé USB « %(pretty_name)s » est configurée comme non amovible par son fabricant et le démarrage de Tails échouera sur cette clé. Veuillez tenter de l'installer sur un modèle différent."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Le dispositif « %(pretty_name)s » est trop petit pour installer Tails (au moins %(size)s Go sont exigés)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Une erreur est survenue lors de l'installation de Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Actualisation des versions..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Les versions ont été mises à jour !"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "L'installation est terminée !"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "L'installation est terminée."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Impossible de monter le périphérique"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Confirmez la clé USB cible"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -407,39 +415,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s périphérique (%(device)s)\n\nToutes les données sur ce périphérique seront perdues."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s périphérique (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Le téléchargement est terminé !"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Échec de téléchargement : "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Vous pouvez ressayer pour reprendre votre téléchargement"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Le fichier sélectionné est illisible. Veuillez changer ses droits ou sélectionner un autre fichier."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Impossible d'utiliser le fichier sélectionné.Il est possible que vous ayez plus de chance en déplaçant l'ISO sur la racine de votre disque (c.-à-d. : C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s sélectionné"
@@ -510,86 +527,3 @@ msgstr "Clé USB cible :"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Réinstaller (supprimer toutes les données)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Pour exécuter le programme d'installation Tails, il vous faut une image ISO qui peut être téléchargée du site Web de Tails : <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Installer"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installer Tails sur une nouvelle clé USB."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• La clé USB sur laquelle vous installez est formatée et toutes les données seront perdues"
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Mettre à niveau"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Mettre à niveau une clé USB Tails vers la version d'une image ISO."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Le stockage persistant chiffré de la clé USB que vous mettez à niveau est préservé."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Besoin d'aide ? Consulter la <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Installer par clonage"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Installer Tails sur une autre clé USB en copiant le système Tails que vous utilisez actuellement."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Le stockage persistant chiffré de la clé USB que vous utilisez actuellement n'est pas copié."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Mettre à niveau par clonage"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Mettre à niveau une autre clé USB Tails vers la même version de Tails que vous utilisez actuellement."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Mettre à niveau à partir d'une ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Mettre à niveau une autre clé USB Tails vers la version d'une image ISO."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Besoin d'aide ? Consulter la <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.fr.html">documentation</a>"
diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po
index 801e73189..f9d5807ab 100644
--- a/fr_CA/fr_CA.po
+++ b/fr_CA/fr_CA.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 18:50+0000\n"
-"Last-Translator: French language coordinator french.coordinator@rbox.me\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -112,179 +112,179 @@ msgstr "Impossible d'enlever le répertoire du SE autonome précédent : %(messa
 msgid "Cannot find device %s"
 msgstr "Le périphérique %s est introuvable"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Impossible d'écrire sur %(device)s, passage à l'étape suivante."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Certaines partitions du périphérique cible %(device)s sont montées. Elles seront démontées avant de démarrer le processus d'installation."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Le système de fichiers est inconnu. Il est possible qu'il faille reformater votre périphérique."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Système de fichiers non pris en charge : %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Exception GLib inconnue en tentant de monter le périphérique : %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Impossible de monter le périphérique : %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Aucun point de montage n'a été trouvé"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Saisie de unmount_device pour « %(device)s »"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Démontage des systèmes de fichiers montés sur « %(device)s »"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Démontage de « %(udi)s » sur « %(device)s »"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Le montage %s existe après démontage"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitionnement du périphérique %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Mise à jour des propriétés de la partition système %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Le périphérique « %(device)s » n'est pas pris en charge, veuillez signaler le bogue."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Nous tentons de continuer quand même."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Vérification du système de fichiers..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Impossible de changer l'étiquette du volume : %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installation du chargeur de démarrage..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Impossible de trouver le module COM32 « %s »"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Suppression de %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s est déjà amorçable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Impossible de trouver la partition"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatage de %(device)s en FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Impossible de trouver gptmbr.bin de SYSLYNUX"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lecture de l'enregistrement d'amorçage maître extrait de %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Impossible de lire l'enregistrement d'amorçage maître extrait de %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Réinitialisation de l'enregistrement d'amorçage maître (MBR) de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Le périphérique est une boucle avec retour, omission de la réinitialisation de l'enregistrement d'amorçage maître"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calcul du SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronisation des données sur le disque..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Erreur de sondage du périphérique"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Aucun périphérique pris en charge n'a été trouvé"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Assurez-vous que votre clé USB est branchée et formatée avec le système de fichiers FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Système de fichiers non pris en charge : %s\nVeuillez sauvegarder votre clé USB et la formater avec le système de fichiers FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Impossible d'obtenir Win32_LogicalDisk ; la requête win32com n'a retourné aucun résultat."
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Introuvable"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -315,40 +315,48 @@ msgstr "L'installation est terminée! (%s)"
 msgid "Tails installation failed!"
 msgstr "L'installation de Tails a échoué!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Avertissement : cet outil doit être exécuté en tant qu'administrateur. Pour ce faire, cliquer sur l'icône et ouvrir les Propriétés. Sous l'onglet Compatibilité, cocher « Exécuter ce programme en tant qu'administrateur »."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Programme d'installation Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Mettre à niveau"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Installer"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s périphérique (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Aucune image ISO n'a été sélectionnée"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Veuillez sélectionner une image ISO de Tails."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Aucun périphérique compatible n'a été trouvé pour installer Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Veuillez connecter une clé USB ou une carte SD d'au moins %0.1f Go."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -356,42 +364,42 @@ msgid ""
 "different model."
 msgstr "La clé USB « %(pretty_name)s » est configurée comme non amovible par son fabricant et le démarrage de Tails échouera sur cette clé. Veuillez tenter de l'installer sur un modèle différent."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Le dispositif « %(pretty_name)s » est trop petit pour installer Tails (au moins %(size)s Go sont exigés)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Une erreur est survenue lors de l'installation de Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Actualisation des versions..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Les versions ont été mises à jour!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "L'installation est terminée!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "L'installation est terminée."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Impossible de monter le périphérique"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Confirmez la clé USB cible"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -399,39 +407,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s périphérique (%(device)s)\n\nToutes les données sur ce périphérique seront perdues."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s périphérique (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Le téléchargement est terminé!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Échec de téléchargement : "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Vous pouvez ressayer pour reprendre votre téléchargement"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Le fichier sélectionné est illisible. Veuillez changer ses droits ou sélectionner un autre fichier."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Impossible d'utiliser le fichier sélectionné.Il est possible que vous ayez plus de chance en déplaçant l'ISO sur la racine de votre disque (c.-à-d. : C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s sélectionné"
@@ -502,86 +519,3 @@ msgstr "Clé USB cible :"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Réinstaller (supprimer toutes les données)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Pour exécuter le programme d'installation Tails, il vous faut une image ISO qui peut être téléchargée du site Web de Tails : <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Installer"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installer Tails sur une nouvelle clé USB."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• La clé USB sur laquelle vous installez est formatée et toutes les données seront perdues"
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Mettre à niveau"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Mettre à niveau une clé USB Tails vers la version d'une image ISO."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Le stockage persistant chiffré de la clé USB que vous mettez à niveau est préservé."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Besoin d'aide? Consulter la <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Installer par clonage"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Installer Tails sur une autre clé USB en copiant le système Tails que vous utilisez actuellement."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Le stockage persistant chiffré de la clé USB que vous utilisez actuellement n'est pas copié."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Mettre à niveau par clonage"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Mettre à niveau une autre clé USB Tails vers la même version de Tails que vous utilisez actuellement."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Mettre à niveau à partir d'une ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Mettre à niveau une autre clé USB Tails vers la version d'une image ISO."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Besoin d'aide? Consulter la <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.fr.html">documentation</a>"
diff --git a/fur/fur.po b/fur/fur.po
index 77a8050ed..888162fb8 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Friulian (http://www.transifex.com/otf/torproject/language/fur/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/fy/fy.po b/fy/fy.po
index ed9406703..b1bc3bbf4 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ga/ga.po b/ga/ga.po
index be8187a34..8a5e9e12a 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/gd/gd.po b/gd/gd.po
index 794975708..4a2cd17c4 100644
--- a/gd/gd.po
+++ b/gd/gd.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/gl/gl.po b/gl/gl.po
index cd52ab482..0eb513c4a 100644
--- a/gl/gl.po
+++ b/gl/gl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 16:54+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -104,179 +104,179 @@ msgstr "Non foi posíbel borrar directorio de LiveOS previo: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Non podo atopar o dispositivo %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Imposible escribir en %(device)s, saltando."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algunhas particións do dispositivo destino %(device)s están montadas. Serán desmontadas antes de comezar o proceso de instalación."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistema de ficheiros descoñecido. Poida que necesite reformatear o seu dispositivo."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistema de ficheiros non soportado: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Non foi posíbel montar o dispositivo: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Non se atoparon puntos de montaxe"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Entrando unmount_device para '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Desmontando sistemas de ficheiros montados en '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Desmontando '%(udi)s' en '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "A montaxe %s existe despois de desmontar"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Particionando dispositivo %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Actualizando as propiedades da partición de sistema %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Dispositivo '%(device)s' non soportado, por favor informe dun bug."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Tentando continuar igualmente."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verificando sistema de ficheiros..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Imposible cambiar a etiqueta de volume: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instalando bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Eliminando %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s xa é arrincable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Incapaz de atopar unha partición"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formateando %(device)s como FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Restablecendo Master Boot Record de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "A unidade é un loopback, omitindo reinicio do MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculando o SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sincronizando datos no disco..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Produciuse un erro sondando o dispositivo"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Non foi posíbel atopar ningún dispositivo soportado"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Asegúrese de que a súa chave USB está enchufada e formateada cun sistema de ficheiros FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Sistema de ficheiros non soportado: %s\nPor favor faga unha copia de seguridade e formatee a súa chave USB cun sistema de ficheiros FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Incapaz de obter Win32_LogicalDisk; a consulta win32com non devolveu resultado algún"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Non se pode atopar"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -307,40 +307,48 @@ msgstr "Instalación completa! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Aviso: esta ferramenta ten que ser executada como administrador. Prema co botón dereito na icona e abra as Propiedades. Na lapela Compatibilidade, marque a caixa "Executar este programa como administrador"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -348,42 +356,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "O dispositivo "%(pretty_name)s" é demasiado pequeno para instalar Tails (precísanse alomenos %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Refrescando versións..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Versións actualizadas!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalación completa!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Non foi posíbel montar o dispositivo"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -391,39 +399,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Completouse a descarga!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Produciuse un erro na descarga:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Pode tentar outra vez a reanudar a súa descarga"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Non se pode ler o ficheiro seleccionado. Por favor amañe os seus permisos ou seleccione outro ficheiro."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Imposible usar o ficheiro seleccionado. Poida que teña máis sorte se move a súa ISO á raíz da súa unidade (p.ex. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seleccionado"
@@ -494,86 +511,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalar Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/gu/gu.po b/gu/gu.po
index 8fa8f327f..ad148af69 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/gu_IN/gu_IN.po b/gu_IN/gu_IN.po
index 550f1d506..1c8f3df85 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Gujarati (India) (http://www.transifex.com/otf/torproject/language/gu_IN/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/gun/gun.po b/gun/gun.po
index 110a22344..49c52e8d4 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Gun (http://www.transifex.com/otf/torproject/language/gun/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ha/ha.po b/ha/ha.po
index f91120238..08b9c9fd0 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Hausa (http://www.transifex.com/otf/torproject/language/ha/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/he/he.po b/he/he.po
index 3303ebfe6..ffe5bf7b0 100644
--- a/he/he.po
+++ b/he/he.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -108,179 +108,179 @@ msgstr "אי אפשר להסיר תיקייה ממערכת ההפעלה הקוד
 msgid "Cannot find device %s"
 msgstr "לא ניתן למצוא את ההתקן %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "אי אפשר לכתוב על  %(device)s, מדלג"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "חלק ממחיצות התקן היעד %(device)s טעונות כרגע. הן תיפרקנה בטרם יחל תהליך ההתקנה."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "מערכת קבצים לא ידועה. המכשיר שלך צריך פרמוט מחדש."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "מערכת הקבצים אינה נתמכת: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "אי אפשר לצרף מכשיר: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "לא נמצאו נקודות חיבור"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "מזין את unmount_device בעבור "%(device)s""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "פורק את כל מערכות הקבצים הטעונות על "%(device)s""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "פורק "%(udi)s" מ-"%(device)s""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "צירוף %s קיים  אחרי שעושים אי צירוף"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "מגדיר מחיצות על התקן %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "מעדכן מאפיינים של מחיצת המערכת %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "מכשיר '%(device)s' לא נתמך, נא לדווח את הבאג."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "מנסה להמשיך בכל זאת."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "מערכת הקבצים מאומתת..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "אי אפשר לשנות תוית  עוצמת קול: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "מתקין bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "הסרת קובץ %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s כבר ניתן לאתחול."
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "אי אפשר למצוא חלוקה"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "יצירת %(device)s כ FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "הגדרה מחדש של Master Boot Record של %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "הכונן הוא loopback, מדלג על אתחול MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "חישוב  SHA1 של %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "מסנכרן נתונים על הדיסק.."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "מכשיר הגורם לטעות"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "לא נמצא התקן נתמך"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "נא לוודא שכונן ה־USB שלך מחובר ושלאחר פרמוט מערכת הקבצים שלו היא מסוג FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "מערכת קבצים בלתי נתמכת: %s\nנא לגבות את ולפרמט את כונן ה־USB שלך למערכת הקבצים FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "אי אפשר לקבל Win32_LogicalDisk. שאילתת win32com לא מחזירה תוצאות."
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "לא יכול למצוא"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -311,40 +311,48 @@ msgstr "ההתקנה הושלמה! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "אזהרה: כלי זה צריך להפעיל בAdministrator. כדי לעשות זאת, לחץ לחיצה ימנית על הסמל ולפתוח את המאפיינים. בכרטיסיית התאימות, סמן את התיבה הפעל תכנית זו בAdministrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -352,42 +360,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "ההתקן "%(pretty_name)s" קטן מכדי להתקין עליו את Tails (לפחות %(size)s GB דרושים)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "מרענן מהדורות..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "מהדורות עודכנו!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "התקנה הושלמה!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "אי אפשר לצרף את המכשיר."
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -395,39 +403,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ההורדה הושלמה!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "הורדה נכשלה:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "ניתן לנסות שוב כדי להמשיך את ההורדה שלך"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "הקובץ שנבחר איננו קריא. אנא תקן את הרשאותיו או בחר בקובץ אחר."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "אי אפשר להשתמש בקובץ  הנבחר. יכול להיות שתצליח אם תעביר את ה ISO  \nשלך למחיצה הראשית של הכונן (למשל, \  :C)."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s נבחר"
@@ -498,86 +515,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "התקן Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/hi/hi.po b/hi/hi.po
index dbf02e51b..ee5779f0d 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/hr/hr.po b/hr/hr.po
index f51681449..f2538bc63 100644
--- a/hr/hr.po
+++ b/hr/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 18:52+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr "Instalacija završena! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s odabrano"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 6d7a10620..f7122422f 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -107,179 +107,179 @@ msgstr "Ne mogu maknuti direktorij iz prethodnoga ŽivogOS‑a: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Ne mogu pronaći uređaj %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Ne mogu pisati na %(device)s; preskačem."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Neke particije odredišnoga uređaja %(device)s su postavljene. One će biti odmontirane prije započinjanja instalacije."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Nepoznat sustav datoteka. Vaš uređaj možda treba ponovno formatirati."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepodržani sustav datoteka: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Nepoznata GLib iznimka prilikom pokušaja postavljanja uređaja: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Ne mogu postaviti uređaj: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nisu pronađene točke postavljanja"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "unosim unmount_device za '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Skidam postavljeni sustav datoteka na '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Skidam '%(udi)s' sa '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Pogon %s postoji i nakon odmontiranja"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Particioniram uređaj %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Ažuriram svojstva particije sustava %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nepodržan uređaj '%(device)s', molimo Vas da prijavite problem."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Pokušavam svejedno nastaviti."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Provjeravam sustav datoteka..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Ne mogu izmijeniti oznaku pogona: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instaliram podizač…"
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Nije uspjelo pronalaženje '%s' COM32 modula"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Uklanjam %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s se već može pokrenuti"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Ne mogu naći particiju"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatiram %(device)s kao FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Nije uspjelo pronalaženje syslinuxovog gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Čitanje izvučenog MBR sa %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Nije uspjelo čitanje izvučenog MBR-a sa %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Ponovno postavljam Master Boot Record %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Pogon se vrti u krug, preskačem resetiranje MBR‑a"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Izračunavam SHA1 %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Usklađujem podatke na disku…"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Greška ispitivanja uređaja"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Ne mogu naći niti jedan podržani uređaj"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pobrinite se da je Vaš USB uključen i formatiran u FAT formatu"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepodržani sustav datoteka: %s\nMolimo Vas da stvorite sigurnosnu kopiju Vašeg USB-a te da ga formatirate koristeći FAT sustav datoteka."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Ne mogu dobiti Win32_LogicalDisk; win32com upit nije vratio nikakve rezultate"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Ne mogu pronaći"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -310,40 +310,48 @@ msgstr "Instalacija dovršena! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails instalacija nije uspjela!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Upozorenje: Ovaj alat morate pokrenuti kao Administrator. Da bi to napravili, kliknite desnom tipkom miša na ikonu i otvorite Svojstva. Pod karticom Kompatibilnost, označite kvačicom "Pokreni ovaj program kao administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails instalacija"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Nadogradnja"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Instalacija"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Nije pronađen uređaj prikladan za instalaciju Tailsa"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Molimo Vas da uključite USB ili SD karticu od najmanje %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -351,42 +359,42 @@ msgid ""
 "different model."
 msgstr "Proizvođač je USB stick "%(pretty_name)s"  konfigurirao kao neuklonjivi medij i Tails se neće uspjeti pokrenuti. Molimo pokušajte s instalacijom na drugačijem modelu. "
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Uređaj "%(pretty_name)s" je premalen da bi se na njega instalirao Tails (potrebno je najmanje %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Došlo je do pogreške prilikom instaliranja Tailsa"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Osvježavam izdanja…"
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Izdanja ažurirana!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalacija dovršena!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Instalacija je završena."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Ne mogu postaviti uređaj"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -394,39 +402,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Preuzimanje dovršeno!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Preuzimanje nije uspjelo:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Možete pokušati ponovno za nastavak preuzimanja"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Izabrana datoteka je nečitljiva. Molimo popravite njezine dozvole ili izaberite drugu datoteku."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nisam u mogućnosti koristiti izabranu datoteku. Možda ćete imati više sreće ako premjestite ISO u korijen Vašega pogona (npr C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s odabrano"
@@ -497,86 +514,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instaliraj Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Kako bi pokrenuli Tails instalaciju trebate ISO sliku koju možete preuzeti sa Tails stranice: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Instalacija"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Instalacija Tailsa na novi USB."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB na koj instalirate će biti formatiran i svi podatci će biti izgubljeni."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Nadogradnja"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Nadogradnja Tails USB-a na verziju ISO slike."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Enkriptirana trajna pohrana Tails USB-a kojeg nadograđujete je sačuvana."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Trebate pomoć? Pročitajte <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edokumentaciju</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Instalacija kloniranjem"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Instalacija Tailsa na drugi USB kopiranjem Tails sustava kojeg trenutno koristite."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Enkriptirana trajna pohrana Tails USB-a kojeg trenutno koristite nije kopirana."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Nadogradnja kloniranjem"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Nadogradite drugi Tails USB na istu verziju Tailsa koju trenutno koristite."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Nadogradnja sa ISO-a"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Nadogradite Tails USB na verziju ISO slike."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Trebate pomoć? Pročitajte <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">dokumentaciju</a>"
diff --git a/ht/ht.po b/ht/ht.po
index 7d044f50e..f98138958 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Haitian (Haitian Creole) (http://www.transifex.com/otf/torproject/language/ht/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/hu/hu.po b/hu/hu.po
index 8c7a8b234..49b44ae1f 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -112,179 +112,179 @@ msgstr "Nem tudom eltvolítani a mappát a LiveOS-ből: %(message)s"
 msgid "Cannot find device %s"
 msgstr "A(z) %s eszköz nem található"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nem tudok írni a(z) %(device)s, kihagyva."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Néhány partíció a cél eszközön %(device)s csatolva vannak. Ezek le lesznek csatolva a telepítés megkezdése előtt."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Ismeretlen fájlrendszer.  Szükséges lehet az eszköz újraformázása."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nem támogatott fájlrendszer: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "%(message)s csatolása nem lehetséges"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nem található csatolásai pont"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "A '%(device)s' eszközre unmount_device végrehajtása"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Csatolt fájlrendszerek lecsatolása '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Lecsatolás '%(udi)s'  '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "%s csatolás létezik lecsatolás után"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "A %(device)s eszköz partícionálása"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "A rendszer partíciók tulajdonságának frissítése %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nem támogatott eszköz '%(device)s', kérlek jelentsd a hibát."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Próbálja folytatni."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Fájlrendszer ellenőrzése…"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "%(message)s meghajtó címkéje nem változtatható meg"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Bootloader telepítése..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "A '%s' COM32 modul nem található."
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)s eltávolítása"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s már bootolható"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nem található partíció"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "A %(device)s formázása FAT32-re"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "A %s Master Boot Recordjának alaphelyzetbe állítása"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Az egység egy hurok, az MBR alaphelyzetbe állítás átugrása"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "%s SHA1 számítása "
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Adat lemezre szinkronizálása..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Hiba az eszköz próbájakor"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nem található támogatott eszköz"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Győződjön meg arról, hogy az USB eszközt bedugta és azon FAT fájlrendszer található"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nem támogatott fájlrendszer: %s\nKérem mentse le az adatait, majd alakítson ki az USB eszközön FAT fájlrendszert."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Sikertelen Win32_LogicalDisk; win32comlekérdezés eredmény nélkül tért vissza"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nem található"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -315,40 +315,48 @@ msgstr "Telepítés kész! (%s)"
 msgid "Tails installation failed!"
 msgstr "A Tails telepítése sikertelen!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Figyelem: Ennek az eszköznek Administrator jogosultsággal kell indulnia. Ahhoz, hogy így futhasson kattintson jobb gombbal az ikonján, nyissa meg a Tulajdonságok ablakot, és a Kompatibilitás fülön jelölje a "Futtatás rendszergazdaként" opciót."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails telepítő"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Frissítés"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Telepít"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -356,42 +364,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "A'z' "%(pretty_name)s" eszköz túl kicsi a Tails telepítéséhez (legalább %(size)s GB szükséges)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Kiadások frissítése..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Kiadások frissítve!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Telepítés kész!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nem lehetséges az eszköz csatolása"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -399,39 +407,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Letöltés kész!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "A letöltés nem sikerült:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Megpróbálhatja újra, így folytatva a letöltést"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "A kijelölt fájl nem olvasható. Változtasd meg a jogosultságokat vagy válassz egy másik fájlt."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nem tudom használni a kiválasztott fájlt. Szerrencsésebb lenne aaz ISO fájlt a meghatjó gyökerébe mozgatni (pl: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s kiválasztva"
@@ -502,86 +519,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails telepítése"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Telepít"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Frissítés"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/hy/hy.po b/hy/hy.po
index 8fdb3c442..d0ed54ba5 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ia/ia.po b/ia/ia.po
index 7e17b10b0..1171e90f4 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/id/id.po b/id/id.po
index 78fbc4600..38145b987 100644
--- a/id/id.po
+++ b/id/id.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -109,179 +109,179 @@ msgstr "Tidak bisa meremove direktori dari LiveOS sebelumnya: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Tidak bisa menemukan perangkat %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Tidak bisa menulis pada %(device)s, lewati"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Beberapa partisi dari perangkat target %(device)s terpasang. mereka akan tidak terpasang sebelum start proses instalasi"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistem file yang tidak dikenal. perangkat anda mesti di format"
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Filesystem yang tidak didukung: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Tidak dapat/gagal ke  mount device: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Tidak ada titik kait"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Enter tidak dipasang_device untuk'%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "tidak terpasangnya /unmounting mounted filessytem pada '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Tidak terpasang '%(udi)s' pada '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Mount%s ada setelah tidak terpasang"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Mempartisi device %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Update properties dari partisi sistem %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Perangkat yang tidak didukung '%(device)s', silakan laporkan sebagai bug"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Mencoba untuk melanjutkan"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Memeriksa filesystem..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Tidak bisa merubah volume label %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Memasang bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Menghapus %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s sudah bisa diboot"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Tidak bisa menemukan partisi"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Memformat %(device)s sebagai FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Mengatur ulang Master Boot Record dari %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Perangkat balikan (loopback), melewatkan mengatur ulang MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Menghitung SHA1 dari %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sinkronisasi data pada disk"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Error probing device"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Tidak bisa menemukan beberapa perangkat pendukung"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pastikan kunci USB Anda terhubung dan diformat dengan sistem berkas FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Filesystem yang tidak didukung: %s Silakan backup dan format USB Anda dengan filesystem FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Gagal untuk meraih Win32_LogicalDisk; win32com Permintaan tidak kembali menghasilkan apapun"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Tidak bisa menemukan"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -312,40 +312,48 @@ msgstr "Pemasangan sudah tuntas! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Peringatan: Tool ini harus dijalankan sebagai administrator. Untuk melakukan ini , klik kanan pada ikon dan buka Properties .Dibawah Tab Compatibility, cek box "Jalankan program ini sebagai adminisrator""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -353,42 +361,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Device "%(pretty_name)s" terlalu kecil untuk menginstall Tails (minimal perlu %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Menyegarkan rilis..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Rilis telah diperbarui!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Pemasangan sudah tuntas!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Gagal memuat perangkat"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -396,39 +404,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Unduhan komplet!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Pengunduhan gagal:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Anda dapat mencoba lagi untuk melanjutkan download Anda"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "File terpilih tidak bisa dibaca. silakan perbaharui izinnya atau pilih file lain"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Tidak bisa menggunakan file yang terpilih. anda mungkin lebih beruntung jika anda memindahkan ISO anda ke akar/root dari drive (ie:C\) anda"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s terpilih"
@@ -499,86 +516,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Pasang Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/is/is.po b/is/is.po
index 85e1a43d6..a9488a429 100644
--- a/is/is.po
+++ b/is/is.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 16:44+0000\n"
-"Last-Translator: Sveinn í Felli sv1@fellsnet.is\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,179 +102,179 @@ msgstr "Gat ekki fjarlægt möppu úr fyrra Live ISO keyrslukerfi: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Get ekki fundið tækið %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Get ekki skrifað á %(device)s, sleppi þessu."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Sumar disksneiðar marktækisins %(device)s eru tengdar í skráakerfið. Þær verða aftengdar áður en uppsetningarferlið hefst"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Óþekkt skráakerfi. Það gæti þurft að forsníða tækið."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Óstutt skráakerfi: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Óþekkt GLib-frávik þegar reynt var að tengja tæki í skráakerfi: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Tókst ekki að tengja tæki: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Engir tengipunktar fundust"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Fer í unmount_device fyrir '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Aftengi tengd skráakerfi á '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Aftengi '%(udi)s' á '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Tengipunktur %s er til staðar eftir aftengingu"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Sneiði geymslupláss tækisins %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Uppfæri eiginleika kerfisdisksneiðar %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Óstutt tæki '%(device)s', tilkynntu um þessa villu."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Reyni samt að halda áfram."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Yfirfer skráarkerfi..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Get ekki breytt heiti á gagnarými: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Uppsetning ræsistjóra..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Gat ekki fundið '%s' COM32 eininguna"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Fjarlægi %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s er þegar ræsanlegt"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Gat ekki fundið disksneið"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Forsníð %(device)s sem FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Gat ekki fundið syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lesið afþjappaðan MBR-ræsigeira frá %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Gat ekki lesið afþjappaðan MBR-ræsigeira frá %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Frumstilli aðalræsifærslu (MBR) %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Drifið er hringtengt (loopback), sleppi endurstillingu á MBR-ræsigeira"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Reikna SHA1 gátsummuna fyrir %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Samræmi gögn á diski..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Villa við að yfirfara tæki"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Fann ekki nein studd tæki"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Gakktu úr skugga um að USB-lykillinn þinn sé tengdur og að hann sé forsniðinn með FAT-skráakerfi"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Óstutt skráakerfi: %s\nTaktu öryggisafrit af USB-lyklinum og forsníddu hann með FAT-skráakerfi."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Tókst ekki að sækja Win32_LogicalDisk; win32com fyrirspurn skilaði engum niðurstöðum"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Get ekki fundið"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "Uppsetningu lokið! (%s)"
 msgid "Tails installation failed!"
 msgstr "Uppsetning Tails mistókst!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Aðvörun: Þetta tól verður að keyra sem kerfisstjóri (administrator). Til að gera það, hægri-smelltu á táknmyndina og opnaðu eiginleikana (Properties). Á samhæfniflipanum (Compatibility), hakaðu við að keyra þetta forrit sem kerfisstjóri (Run this program as an administrator)."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails-uppsetningarforrit"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Uppfæra"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Setja upp"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s tæki (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Engin ISO-diskmynd valin"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Veldu Tails ISO-diskmynd."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Ekkert hentugt tæki fannst til uppsetningar á Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Tengdu USB-minnislykil eða SD-minniskort með að minnsta kosti %0.1f GB gagnarýmd."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr "USB-minnislykillinn "%(pretty_name)s" er ekki hannaður frá framleiðanda til að vera útskiptanlegur, Tails mun því ekki geta ræst upp af honum. Prófaðu að nota einhverja aðra tegund minnislykils."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Tækið "%(pretty_name)s" er of lítið til að hægt sé að setja Tails upp á því (að minnsta kosti %(size)s GB eru nauðsynleg)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Villa kom upp við að setja upp Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Endurles útgáfur..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Uppfærði útgáfur!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Uppsetningu lokið!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Uppsetningu er lokið."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Tókst ekki að tengja tæki"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s tæki (%(device)s)\n\nÖll gögn á á þessum USB-lykli munu tapast."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s tæki (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Niðurhali lokið!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Niðurhal mistókst: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Þú getur reynt aftur til að klára niðurhalið"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Skráin sem þú valdir er ekki lesanleg. Lagaðu heimildir hennar eða veldu aðra skrá."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Gat ekki notað völdu skrána. Það gæti gengið betur ef þú færir ISO-skrána á rót drifsins (dæmi: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s valið"
@@ -492,86 +509,3 @@ msgstr "USB-minnislykill til að skrifa á:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Setja upp aftur (eyða öllum gögnum)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Setja upp Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Til að keyra Tails-uppsetningarforritið þarftu ISO-diskmynd sem hægt er að sækja á vefsvæði Tails: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Setja upp"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Setja Tails upp á nýjan USB-minnislykil."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB-lykilinn sem þú setur upp á verður forsniðinn og öll gögn á honum munu tapast."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Uppfæra"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Uppæra Tails USB-minnislykil í útgáfu af ISO-diskmynd."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Varanlegu gagnageymslunni á Tails USB-lyklinum sem þú ert að nota núna er haldið til haga."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Vantar þig hjálp? Lestu <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Ehj%C3%A1lparskj...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Setja upp með því að klóna"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Setja Tails upp á USB-minnislykil með því að afrita Tails-kerfið sem þú ert að nota núna."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Varanlega gagnageymslan á Tails USB-lyklinum sem þú ert að nota núna er ekki afrituð."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Uppfæra með því að klóna"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Uppæra annan Tails USB-minnislykil í sömu útgáfu af Tails og þá sem þú ert að nota núna."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Uppfæra af ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Uppæra annan Tails USB-minnislykil í útgáfu af ISO-diskmynd."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Vantar þig hjálp? Lestu <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">hjálparskjölin</a>"
diff --git a/it/it.po b/it/it.po
index 0bb5a63ba..d2b971790 100644
--- a/it/it.po
+++ b/it/it.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-18 12:51+0000\n"
-"Last-Translator: Random_R\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -117,179 +117,179 @@ msgstr "Impossibile rimuovere la directory della precendente LiveOS: %(message)s
 msgid "Cannot find device %s"
 msgstr "Impossibile trovare il dispositivo %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Impossibile scrivere su %(device)s, operazione ignorata."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Alcune partizioni del dispositivo di destinazione %(device)s sono montate. Verranno smontate prima di iniziare il processo di installazione."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Filesystem sconosciuto. Potrebbe essere necessario formattare il disco di nuovo."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Filesystem non supportato: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Eccezione GLib sconosciuta tentando di montare il dispositivo: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Impossibile eseguire il mount del dispositivo: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nessun punto di mount definito"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Inserire unmount_device per '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Smontaggio dei filesystem montati su '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Smontaggio di '%(udi)s' su '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Mount %s esiste dopo l'operazione di unmount"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partizionamento dispositivo %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Aggiornamento proprietà della partizione di sistema %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Dispositivo '%(device)s' non supportato, si prega di segnalare l'errore."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Tentativo di continuare comunque."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verifica del filesystem in corso..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Impossibile cambiare l'etichetta di volume: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installazione bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Impossibile trovare il modulo '%s' COM32"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Cancellazione %(file)s in corso"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s è già avviabile"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Impossibile trovare la partizione"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formattazione %(device)s con filesystem FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Impossibile trovare syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lettura MBR estratto da %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Impossibile leggere MBR estratto da %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Reset del Master Boot Record di %s in corso"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Il drive è una unità di loopback, operazione di reset del MBR ignorata"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calcolo SHA1 di %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sincronizzazione dati sul disco..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Errore durante la rilevazione della periferica"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nessun dispositivo supportato trovato"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Assicurarsi che il pendrive USB sia collegato e formattato con filesystem FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Filesystem non supportato: %s\nEseguire un backup e formattare il pendrive USB con il filesystem FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Impossibile trovare Win32_LogicalDisk; win32com non ha restituito nessun risultato"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Impossibile trovare"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -320,40 +320,48 @@ msgstr "Installazione completata! (%s)"
 msgid "Tails installation failed!"
 msgstr "Installazione di Tails fallita!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Attenzione: questo programma necessita dei permessi di amministratore. Per poterlo aprire, fai click destro sull'icona, quindi su "Proprietà". Sotto la scheda Compatibilità, click sulla box "Apri questo programma come Administrator""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Installer di Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Aggiorna"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Installa"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "Dispositivo %(size)s %(vendor)s %(model)s (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Nessuna immagine ISO selezionata"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Seleziona un'immagine ISO di Tails."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Nessun dispositivo adatto all'installazione di Tails trovato"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Inserisci una chiave USB o una scheda SD di almeno %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -361,42 +369,42 @@ msgid ""
 "different model."
 msgstr "La penna USB "%(pretty_name)s" è configurata come non-rimovibile dal suo produttore e Tails non potrà avviarsi. Prova ad installarlo in un modello differente."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Il dispositivo "%(pretty_name)s" è troppo piccolo per installarci Tails (almeno %(size)s GB necessari)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Riscontrato un errore durante l'installazione di Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Ricaricamento delle release in corso..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Release aggiornate!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installazione completata!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Installazione completata."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Impossibile montare il dispositivo"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Conferma la penna USB di destinazione"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -404,39 +412,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "Dispositivo %(size)s %(vendor)s %(model)s (%(device)s)\n\nTutti i dati su questa penna USB verranno persi."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "Dispositivo %(vendor)s %(model)s (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download completo!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Download fallito:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "È possibile tentare di ripristinare il download"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Il file selezionato è illeggibile. Si prega di modificarne i permessi o selezionare un altro file."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Impossibile aprire il file selezionato. Provare a spostare il file ISO sulla root del disco (ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s selezionato/i"
@@ -507,86 +524,3 @@ msgstr "Penna USB di destinazione:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Reinstalla (elimina tutti i dati)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installare Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Per avviare l'installer di Tails ti serve un'immagine ISO che può essere scaricata dal sito di Tails: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Installa"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installa Tails su una nuova chiave USB."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• La chiave USB su cui installi viene formattata e tutti i dati eliminati."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Aggiorna"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Aggiorna una chiave USB Tails ad una versione su immagine ISO."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• La memoria persistente cifrata della chiave USB Tails che aggiorni viene conservata."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Serve aiuto? Leggi la <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentazione</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Installa clonando"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Installa Tails su un'altra chiave USB copiando il sistema Tails che stai usando attualmente."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• La memoria persistente cifrata della chiave USB Tails che stai usando attualmente non viene copiata."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Aggiorna clonando"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Aggiorna un'altra chiave USB Tails alla stessa versione di Tails che stai usando attualmente."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Aggiorna da ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Aggiorna un'altra chiave USB Tails alla versione di un'immagine ISO."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Serve aiuto? Leggi la <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentazione</a>"
diff --git a/ja/ja.po b/ja/ja.po
index be553962d..3a1d9561b 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -109,179 +109,179 @@ msgstr "以前の LiveOSからディレクトリ を削除できません: %(mes
 msgid "Cannot find device %s"
 msgstr "デバイス %s が見つかれません"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "%(device)sに書き込めません、スキップします"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "ターゲットのデバイス %(device)s のパーティションのいくつかがマウントされました。インストールプロセスが開始する前にこれらはアンマウントされます。"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "不明なファイルシステム。。デバイスを再フォーマットする必要があるかもしれません。"
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "サポートしていないファイルシステム: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "デバイスをマウントできません: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "マウントポイントがみつかりません"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "'%(device)s'に unmount_device を入力中"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "%(device)s上にマウントされたファイルシステムのマウントを解除中"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "%(device)s上の'%(udi)s'のマウントを解除中"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "アンマウント後%sの実体をマウント"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "デバイス %(device)s のパーティションを構成中"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "システムパーティション %(system_partition)s のプロパティを更新中"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "サポートされていないデバイス '%(device)s' 、バグを報告してください。"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "とにかく続行しようとしています。"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "ファイルシステムを検証中..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "ボリュームラベルを変更できません: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "ブートローダーをインストール中 ..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)sを削除中"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%sはすでに起動可能です"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "パーティションを見つけられません"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)sをFAT32としてフォーマット中"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "%sのマスターブートレコードをリセット中"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "ドライブがループバックです。MBRリセットをスキップします。"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "%sの SHA1を計算中"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "ディスク上のデータを同期化中..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "デバイスを厳密に調査中にエラー"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "サポートされているデバイスを見つけられません"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "USB ストレージデバイスが接続され、FAT ファイルシステムでフォーマットされていることを確認してください。"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "サポートしていないファイルシステム: %s\nUSB ストレージデバイスをバックアップし、FAT ファイルシステムでフォーマットしてください。"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Win32_LogicalDiskを入手できません。win32comのクエリーがいかなる結果も返しませんでした。"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "見つけることができません。"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -312,40 +312,48 @@ msgstr "インストール完了！ (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "警告: このツールは管理者として実行する必要があります。これを行うには、アイコンを右クリックして、プロパティーを開いてください。互換性タブで、「管理者としてこのプログラムを実行する」のチェックボックスをチェックしてください。"
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -353,42 +361,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "デバイス "%(pretty_name)s" は記憶領域が小さすぎるため、 Tails をインストールすることができません（少なくとも %(size)s GB 必要です）。"
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "リリースを更新中..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "リリースがアップデートされました！"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "インストール完了しました！"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "デバイスをマウントできません"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -396,39 +404,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ダウンロード完了！"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "ダウンロード失敗: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "ダウンロードを再開することができます"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "選択されたファイルは読み込めません。パーミッションを修正するか、ほかのファイルを選択してください。"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "選択されたファイルを使用できません。ISO をデバイスのルート(例えば C:\) に移動するとさらに上手くいくかもしれません。"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)sが選択されました"
@@ -499,86 +516,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tailsをインストール"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/jv/jv.po b/jv/jv.po
index 863868a50..823e422cf 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Javanese (http://www.transifex.com/otf/torproject/language/jv/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ka/ka.po b/ka/ka.po
index 9c16702a2..18f9fe726 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:46+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/kk/kk.po b/kk/kk.po
index 4df5577bb..70a0ed1e2 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/km/km.po b/km/km.po
index f51ff416b..e7fa872fe 100644
--- a/km/km.po
+++ b/km/km.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr "មិនអាចលុបថតចេញពី LiveOS ព
 msgid "Cannot find device %s"
 msgstr "មិនអាចរកឃើញឧបករណ៍ %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "មិនអាចសរសេរនៅលើ %(device)s, រំលង។"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "ភាគថាសមួយចំនួននៃឧបករណ៍គោលដៅ %(device)s ត្រូវបានម៉ោន។ ពួកវានឹងត្រូវបានអាន់ម៉ោន មុនពេលចាប់ផ្ដើមដំណើរការដំឡើង។"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "មិនស្គាល់ប្រព័ន្ធឯកសារ។ ឧបករណ៍របស់អ្នកអាចចាំបាច់ត្រូវធ្វើទ្រង់ទ្រាយឡើងវិញ។"
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "ប្រព័ន្ធឯកសារមិនគាំទ្រ៖ %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "មិនអាចម៉ោនឧបករណ៍៖ %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "រកមិនឃើញចំណុចម៉ោន"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "បញ្ចូលឧបករណ៍អាន់ម៉ោនសម្រាប់ '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "ការអាន់ម៉ោនប្រព័ន្ធឯកសារដែលបានម៉ោននៅលើ '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "ការអាន់ម៉ោន '%(udi)s' នៅលើ '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "ម៉ោន %s ដែលមានស្រាប់បន្ទាប់ពីអាន់ម៉ោន"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "ការចែកភាគថាសឧបករណ៍ %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "ធ្វើបច្ចុប្បន្នភាពលក្ខណសម្បត្តិភាពថាសប្រព័ន្ធ %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "មិនគាំទ្រឧបករណ៍ '%(device)s', សូមរាយការណ៍កំហុស។"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "នៅតែព្យាយាមបន្ត។"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "កំពុងផ្ទៀងផ្ទាត់ប្រព័ន្ធឯកសារ..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "មិនអាចប្ដូរស្លាកកម្រិតសំឡេង៖ %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "កំពុងដំឡើងកម្មវិធីផ្ទុកការចាប់ផ្ដើមឡើងវិញ..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "កំពុងលុប %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s អាចចាប់ផ្ដើមឡើងវិញបាន"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "រកមិនឃើញភាគថាស"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "ការធ្វើទ្រង់ទ្រាយ %(device)s ជា FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "កំណត់ Master Boot Record របស់ %s ឡើងវិញ"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "ដ្រាយគឺជារង្វិលជុំត្រឡប់, រំលងការកំណត់ MBR ឡើងវិញ"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "កំពុងគណនា SHA1 នៃ %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "កំពុងធ្វើសមកាលកម្មទិន្នន័យនៅលើថាស..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "កំហុសក្នុងការស្ទង់ឧបករណ៍"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "រកមិនឃើញឧបករណ៍គាំទ្រ"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "សូមប្រាកដថាបានដោតយូអេសប៊ីរបស់អ្នក ហើយធ្វើទ្រង់ទ្រាយដោយប្រើប្រព័ន្ធឯកសារ FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "មិនគាំទ្រប្រព័ន្ធឯកសារ៖ %s\nសូមបម្រុងទុក និងធ្វើទ្រង់ទ្រាយយូអេសប៊ីរបស់អ្នកដោយប្រើប្រព័ន្ធឯកសារ FAT ។"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "មិនអាចយក Win32_LogicalDisk; សំណួរ win32com មិនបានត្រឡប់លទ្ធផលណាមួយ"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "រកមិនឃើញ"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "ការដំឡើងបានបញ្ចប់! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "ព្រមាន៖ ឧបករណ៍នេះត្រូវដំណើរការជាអ្នកគ្រប់គ្រង។ ដើម្បីធ្វើវា អ្នកត្រូវចុចកណ្ដុរស្ដាំលើរូបតំណាង រួចបើកលក្ខណសម្បត្តិ។ នៅក្រោមផ្ទាំងភាពឆបគ្នា ធីកប្រអប់ "ដំណើរការកម្មវិធីនេះជាអ្នកគ្រប់គ្រង""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "កំពុងផ្ទុកការចេញផ្សាយឡើងវិញ..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "បានធ្វើបច្ចុប្បន្នការចេញផ្សាយ!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "ការដំឡើងបានបញ្ចប់!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "មិនអាចម៉ោនឧបករណ៍"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ការទាញយកបានបញ្ចប់!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "ការទាញយកបានបរាជ័យ៖"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "អ្នកអាចព្យាយាមម្ដងទៀតដើម្បីធ្វើបន្តការទាញយករបស់អ្នក"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "ឯកសារដែលបានជ្រើសជាឯកសារដែលមិនអាចអានបាន។ សូមកែសិទ្ធិ ឬជ្រើសឯកសារផ្សេង។"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "មិនអាចប្រើឯកសារដែលបានជ្រើស។ អ្នកអាចមានសំណាងជាង បើអ្នកផ្លាស់ទី ISO ទៅ root នៃដ្រាយរបស់អ្នក (ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "បានជ្រើស %(filename)s"
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "ដំឡើង Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/kn/kn.po b/kn/kn.po
index 638fea4e5..e22bee72e 100644
--- a/kn/kn.po
+++ b/kn/kn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:45+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ko/ko.po b/ko/ko.po
index 8b20cedd9..63cd7ee07 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -109,179 +109,179 @@ msgstr "이전 LiveOS에서 디렉토리를 삭제할 수 없습니다 : %(messa
 msgid "Cannot find device %s"
 msgstr "%s 장치를 찾을 수 없음 "
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "%(device)s에 쓸 수 없습니다. 스킵합니다."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "대상 장치 %(device)s 파티션의 일부가 마운트되었습니다. 설치 프로세스가 시작하기 전에 이들은 마운트 해제됩니다."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "알 수없는 파일 시스템. 장치를 다시 포맷해야할지도 모릅니다."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "지원되지 않는 파일 시스템: %s "
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "장치를 탑재하는 동안 알 수 없는 GLib 예외가 발생했습니다:%(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "장치를 마운트 할 수 없습니다: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "마운트 포인트를 찾을 수 없습니다."
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "'%(device)s'에 unmount_device를 입력 중"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "%(device)s에 마운트 된 파일 시스템을 마운트 해제 중"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "%(device)s에 '%(udi)s'를 분리 중"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "마운트 해제 후 %s의 실체를 마운트"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "장치 %(device)s의 파티션을 구성 중"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "%(system_partition)s 시스템 파티션의 속성을 업데이트합니다."
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "지원되지 않는 장치 '%(device)s', 버그를 보고하십시오."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "어쨌든간에 계속하기."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "파일 시스템 확인 중... "
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "볼륨 레이블을 변경할 수 없습니다: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "부트 로더를 설치 중..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "'%s' COM32 모듈을 찾을 수 없습니다."
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)s를 삭제 중"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s는 이미 부팅 가능합니다"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "파티션을 찾을 수 없습니다."
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s를 FAT32로 포맷 중"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "syslinux' gptmbr.bin을 찾을 수 없습니다."
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "%s에서 추출한 MBR 읽기"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "%(path)s에서 추출 된 MBR을 읽을 수 없습니다."
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "%s의 마스터 부트 레코드를 재설정 중"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "드라이브가 루프백입니다. MBR 재설정을 건너 뜁니다."
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "%s의 SHA1 계산 중"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "디스크의 데이터를 동기화 중..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "장치를 엄격하게 조사하는 동안 오류"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "지원되는 장치를 찾을 수 없습니다."
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "USB 키가 연결되어 FAT 파일 시스템으로 포맷되어 있는지 확인 "
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "지원되지 않는 파일 시스템: %s\nUSB 키를 FAT 파일 시스템으로 백업 및 포맷하십시오.  "
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Win32_LogicalDisk를 사용할 수 없습니다. win32com 쿼리가 어떠한 결과도 반환하지 않았습니다."
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "찾을 수 없음"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -312,40 +312,48 @@ msgstr "설치 완료! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails 설치가 실패했습니다!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "경고 : 이 프로그램을 실행하기 위해 관리자 권한으로 전환해야 합니다. 아이콘을 오른쪽 마우스로 클릭하여 속성으로 들어간 후, 호환성 탭에서 "관리자 권한으로 프로그램 실행"을 체크해 주세요."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails 설치 프로그램"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "업그레이드"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "설치"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Tails 설치에 적합한 장치를 찾을 수 없음"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "최소 %0.1fGB의 USB 플래시 드라이브 또는 SD 카드를 연결하십시오."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -353,42 +361,42 @@ msgid ""
 "different model."
 msgstr "USB 스틱 "%(pretty_name)s"는 제조업체가 제거 할 수 없도록 구성하였기 때문에 Tails가 시작되지 않습니다. 다른 모델로 설치를 시도해 보십시오."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "선택된 장치 "%(pretty_name)s" 의 용량이 모자라서 Tail를 설치할 수 없습니다 (최소 %(size)s GB 필요) "
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Tails 설치 중 오류가 발생했습니다."
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "자료 업데이트 중..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "자료가 업데이트되었습니다!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "다운로드 완료! "
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "설치가 완료되었습니다."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "장치를 구성할 수 없습니다."
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -396,39 +404,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "다운로드 완료! "
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "다운로드 실패:  "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "다운로드를 다시 시작할 수 있습니다  "
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "선택된 파일은 읽을 수 없습니다. 권한을 수정하거나 다른 파일을 선택하십시오."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "지정된 파일을 사용할 수 없으니 루트 디렉토리에 ISO 파일을 이동시키십시오. (예 : C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s 선택됨"
@@ -499,86 +516,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails 설치"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Tails Installer를 실행하려면 Tails 웹 사이트에서 다운로드 할 수 있는 ISO 이미지가 필요합니다: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "설치"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• 새 USB 스틱에 Tails를 설치"
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB 스틱을 포맷 하면 모든 데이터가 손실 됩니다."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "업그레이드"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Tails USB 스틱을 ISO 이미지 버전으로 업그레이드 하십시오."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ko_KR/ko_KR.po b/ko_KR/ko_KR.po
index 30b90def5..ffc8a8cab 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/otf/torproject/language/ko_KR/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "마운트 지점을 찾을 수 없습니다."
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "부트로더 설치중..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)s 제거 중"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "새 릴리즈 확인 중..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "새 릴리즈 확인!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "설치 완료!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s이(가) 선택됨."
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "테일즈 설치"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ku/ku.po b/ku/ku.po
index 88d62fe1a..73bedebde 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Kurdish (http://www.transifex.com/otf/torproject/language/ku/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ku_IQ/ku_IQ.po b/ku_IQ/ku_IQ.po
index dcba52d4e..04e588ec5 100644
--- a/ku_IQ/ku_IQ.po
+++ b/ku_IQ/ku_IQ.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/otf/torproject/language/ku_IQ/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "دامەزراندن تەواو بوو!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "داگرتنەکە تەواو بوو!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/kw/kw.po b/kw/kw.po
index 11f721421..42f5bd239 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Cornish (http://www.transifex.com/otf/torproject/language/kw/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ky/ky.po b/ky/ky.po
index 48de7d20b..9f34e801a 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Kyrgyz (http://www.transifex.com/otf/torproject/language/ky/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/la/la.po b/la/la.po
index 7ce54d4c6..bb4182425 100644
--- a/la/la.po
+++ b/la/la.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr "Non possum ordinem de LiveOS anteo delere: %(message)s"
 msgid "Cannot find device %s"
 msgstr "%s apparatum invenire non possum"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "In %(device)s scribere non possum, non facitur."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Nonnullae partes apparatus finis %(device)s sciti sunt. Nesciti erint ante inpositionem."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Apparatus scire non possum: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Puncti scientiae inveniti non sunt"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Indatur unmount_device pro '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Scire %s post nescitionem existit"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partes apparatus %(device)s facitur"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Adhuc continuare probatur"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Notam voluminis mutare non possum: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Acquiritur initiator..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Deletur %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s iam inire potest"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Partes invenire non possum"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Forma %(device)s datur ut FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""Master Boot Record" de %s reponitur"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""Drive" est repositio de MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Reor SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Informatio ad tempus aequle ponitur"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Vitium apparet probans apparatum"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nulli apparatus, qui usare possum, invenire possum"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "USB clavis tua in portu esse et formam FAT habere debet"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Non possum Win32_LogicalDisk arcessere; win32com quaestio responsa nulla dedit"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Invenire non possum"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr "Inpositio facta! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Apparatus "%(pretty_name)s" parvior pro inpositione Caudarum est (minime %(size)s GB egetur)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Programmata renovatur..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Programmata renovata sunt!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Inpositio facta!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Apparatus scire non possum"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Acquisitio facta!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Acquistus non est:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Sententias electas legere non licet. Muta licentiam legendi aut elige sententias alias."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Sententias electas usare non possum. Fortasse poterim, si ISO ad radicem apparatus (est C:\) moves."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s electus"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Caudas inponere"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/lb/lb.po b/lb/lb.po
index a36c4368a..ef19c5fdc 100644
--- a/lb/lb.po
+++ b/lb/lb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr "Verzeechnes vum leschte LiveOS konnt net geläscht ginn: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Kann d'Maschinn %s net fannen"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Net méiglech op %(device)s ze schreiwen, iwwersprangen."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "E puer Partitioune vum ausgewielte Medium %(device)s si gemount. Se wäerten ausgehaange ginn ier den Installatiounsprozess ufänkt."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Onbekanntent Dateisystem. D'Medium muss néi formatéiert ginn."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Dateisystem net ënnerstëtzt: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Medium konnt net agehaangen ginn: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Keng Plaz zum Mounten fonnt"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "unmount_devide fir '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Aushänke vum agehaangenem Dateisystem op '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Aushänke vu '%(udi)s' op '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Mount %s existéiert nach no dem aushänken."
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Späichermedium %(device)s gëtt partitionéiert"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Astellunge vun der System Partitioun %(system_partition)s gi geupdatet"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Medium net ënnerstëtzt '%(device)s'. Mellt wann ech gelift de Feeler."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Versichen trotzdem weider ze maachen."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Dateisystem verifizéieren..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Ännerung vun der Volumebeschreiwung net méiglech: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Bootloader gëtt installéiert..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Läschen %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s ass schonns bootbar"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Et gouf keng Partitioun fonnt"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s gëtt als FAT32 formatéiert."
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Master Boot Record vun %s gëtt zeréck gesat"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "D'Lafwierk ass e Loopback, MBR zerécksetze gëtt iwwersprongen"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "SHA1 Zomm vun %s gëtt berechent"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Daten op dem Disk gi synchroniséiert..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Feeler beim iwwerpréiwe vum Späichermedium"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Et konnt kee Medium fonnt gi wat ënnerstëtzt gëtt"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Stellt sécher, datt den USB Stick agestach ass an FAT formatéiert ass"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Dateisystem net ënnerstëtzt: %s\nMacht ee Backup a formatéiert den USB Stick mat dem FAT Dateisystem."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Win32_LogicalDisk konnt net ermëttelt ginn; de win32com Opruff huet keng Resultater bruecht."
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Kann net fonnt ginn"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr "Installatioun ofgeschloss! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Warnung: Dëst Tool muss als Administrateur ausgefouert ginn. Fir dat ze maachen, musst der op der Maus op den Icon riets klicken an dann d'Astellungen auswielen. Ënnert dem Reider "Kompatibilitéit", wielt der dann "Dëst Programm als Administrateur ausféieren" aus."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "D'Medium "%(pretty_name)s" ass ze kleng fir Tails dorobber ze installéieren (et ginn op mannst %(size)s GB gebraucht)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Verëffentlechunge ginn aktualiséiert."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Verëffentlechunge goufen aktualiséiert!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installatioun ofgeschloss!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Medium konnt net agehaange ginn"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download fäerdeg!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Download feel geschloen"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Download probéieren ze resuméieren"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Déi ausgewielten Datei ass net liesbar. Ännert wann ech gelift är Berechtegungen oder wielt eng aner Datei aus."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Net méiglech déi ausgewielten Datei ze benotzen. Dir hutt wuel méi Gléck wann dir är ISO direkt an engem Lafwierk ofleet (zB: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ausgewielt"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails installéieren"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/lg/lg.po b/lg/lg.po
index b61ab656b..a113a7727 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Ganda (http://www.transifex.com/otf/torproject/language/lg/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ln/ln.po b/ln/ln.po
index e21b7fb41..3db475a4c 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Lingala (http://www.transifex.com/otf/torproject/language/ln/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/lo/lo.po b/lo/lo.po
index 0ae2e15bb..c9b3faa9e 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Lao (http://www.transifex.com/otf/torproject/language/lo/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s ພ້ອມທີ່ຈະບຸດຕ໌ໄດ້ແລ້ວ"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "ປະສານທຽບຂໍ້ມູນໃນດີສ"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr "ການຕິດຕັ້ງສຳເລັດແລ້ວ! ̣̀(%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "ຄຳເຕືອນ: ເຄື່ອງມືເຫຼົ່ານີ້ ຕ້ອງການແລ່ນໃນນາມຜູ້ບໍລິຫານ. ເພື່ອປະຕິບັດດັ່ງນີ້ໄດ້, ໃຫ້ກົດ ມາວສ໌ປຸ່ມຂວາ ໃສ່ ໄອຄັອນ ແລະ ໄຂ Properties. ຢູ່ເທິງແຖບ Compatibility, ໃຫ້ໝາຍເອົາຫ້ອງ "Run this program as an administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "ການຕິດຕັ້ງສຳເລັດ!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "ບໍ່ສາມາດຕິດຕັ້ງອຸປະກອນນີ້"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ດາວໂຫຼດ ສຳເລັດ!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "ດາວໂຫຼດ ລົ້ມເຫຼວ:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "ທ່່ານ ສາມາດ ລອງ ທວນຄືນ ການດາວໂຫຼດ ຂອງ ທ່ານໄດ້ອີກ"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "ບໍ່ສາມາດໃຊ້ງານ ແຟ້ມ ທີ່ເລືອກ ໄດ້. ທ່ານອາດໂຊກດີ ຖ້າຫາກ ທ່ານ ຍ້າຍເອົາ ISO ໄປໄວ້ ຢູ່ root ຂອງ ຊ່ອງອ່ານຂອງທ່ານ (ເຊັ່ນ: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ຖືກເລືອກແລ້ວ"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/lt/lt.po b/lt/lt.po
index a44890878..174a92f45 100644
--- a/lt/lt.po
+++ b/lt/lt.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -105,179 +105,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Nepavyksta rasti įrenginio %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nepavyko rašyti į %(device)s, praleidžiama."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Kai kurie skaidiniai paskirties įrenginyje %(device)s yra prijungti. Prieš pradedant diegimo procesą, jie bus atjungti."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Nežinoma failų sistema. Gali būti, kad jūsų įrenginys turi būti iš naujo formatuotas."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepalaikoma failų sistema: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nepavyko prijungti įrenginio: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nerasta prijungimo taškų"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Atjungiamos failų sistemos ties "%(device)s""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Atjungiama "%(udi)s" ties "%(device)s""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Skaidomas įrenginys %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Atnaujinamos %(system_partition)s sistemos skaidinio savybės"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nepalaikomas įrenginys "%(device)s", prašome pranešti apie klaidą."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Bandoma vis tiek tęsti."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Tikrinama failų sistema..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nepavyko pakeisti tomo etiketės: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Diegiama paleidyklė..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Šalinama %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s jau ir taip paleidžiamas"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nepavyko rasti skaidinio"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatuojama %(device)s kaip FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Atstatomas %s paleidimo įrašas (MBR)"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Diskas yra kilpinis sujunginys, praleidžiamas MBR atstatymas"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Apskaičiuojama %s SHA1 suma"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sinchronizuojami duomenys diske..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nepavyko rasti jokio palaikomo įrenginio"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepalaikoma failų sistema: %s\nPrašome padaryti savo USB atmintuko atsarginę kopiją ir formatuoti jį su FAT failų sistema."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nepavyko gauti Win32_LogicalDisk; win32com užklausa negrąžino jokių rezultatų"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nepavyko rasti"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -308,40 +308,48 @@ msgstr "Diegimas baigtas! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -349,42 +357,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Įrenginys "%(pretty_name)s" yra pernelyg mažas, kad būtų įdiegta Tails (reikalingas bent %(size)s GB įrenginys)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Diegimas baigtas!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nepavyko prijungti įrenginio"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -392,39 +400,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Atsiuntimas baigtas!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Atsiuntimas nepavyko: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Galite bandyti tęsti atsisiuntimą. "
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "Pasirinktas %(filename)s"
@@ -495,86 +512,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Įdiegti Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/lv/lv.po b/lv/lv.po
index 5febebb68..b00288d4b 100644
--- a/lv/lv.po
+++ b/lv/lv.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:23+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -103,179 +103,179 @@ msgstr "Nespēj noņemt direktoriju no iepriekšējās LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Nav iespējams atrast ierīci %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nespēj rakstīt %(device)s, šis solis tiek izlaists."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Uz mērķa ierīces %(device)s ir uzmontēti daži nodalījumi. Tie tiks nomontēti pirms instalēšanas procesa sākšanas."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Nezināma datņu sistēma.  Iespējams, ierīci nepieciešams pārformatēt."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Datņu sistēma, kura netiek atbalstīta: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Nezināms GLib izņēmums, montējot ierīci: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nespēj montēt iekārtu: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Montēšanas punkti netika atrasti"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Ievada unmount_device objektam '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Nomontē uz '%(device)s' uzmontētās datņu sistēmas"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Nomontē  '%(udi)s' , kurš atrodas uz '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Pēc nomontēšanas pastāv montējums %s"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Nodalīšanas ierīce %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Jaunina sistēmas nodalījuma īpašības %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Neatbalstīta ierīce '%(device)s', lūdzu ziņojiet par šo kļūdi."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Lai vai kas, cenšas turpināt."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verificē datņu sistēmu..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nespēj mainīt sējuma iezīmi: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instalē sāknēšanas lādētāju..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Neizdevās atrast '%s' COM32 moduli"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Noņem %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s jau ir sāknējams"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nespēj atrast nodalījumu"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatē %(device)s kā FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Neizdevās atrast syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lasa no %s izgūto MBR "
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Neidzevās nolasīt no %(path)s izgūto MBR"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Atiestata %s pamatsāknēšanas ierakstu jeb MBR"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Disks ir cilptestā, tiek izlaista MBR atiestatīšana"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Aprēķina %s SHA1"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sinhronizē datus uz diska..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Kļūda pētot ierīci"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nevarēja atrast jebkādu atbalstītu ierīci"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pārliecinieties, ka USB atslēga ir iesprausta un formatēta kā FAT datņu sistēma"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Neatbalstīta datņu sistēma: %s\nLūdzu veiciet datu rezerves kopēšanu un formatējiet savu USB atslēgu kā FAT datņu sistēmu."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nespēj sasniegt Win32_LogicalDisk; win32com vaicājums nesniedza atbildes"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nav iespējams atrast"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -306,40 +306,48 @@ msgstr "Instalēšana pabeigta! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails instalācija neizdevās!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Brīdinājums: Šis rīks jālieto administratora režīmā. Lai to izdarītu, ar labo peles taustiņu noklikšķiniet uz ikonas un atveriet Rekvizītus. Verot cilni Savietojamība, atzīmējiet lodziņu "Izpildīt programmu administratora režīmā"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails instalētājs"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Jaunināt"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Instalēt"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Neizdevās atrast nevienu ierīci, kas spēj instalēt Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Lūdzu pievienojiet USB zibatmiņu vai SD karti, kuru ietilpība ir vismaz %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -347,42 +355,42 @@ msgid ""
 "different model."
 msgstr "USB disku "%(pretty_name)s" tā ražotājs ir nokonfigurējis kā nenoņemamu, un Tails neizdosies no tā startēt. Lūdzu mēģiniet instalēt uz cita modeļa."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Ierīce "%(pretty_name)s" ir pārāk maza, lai instalētu Tails (ir nepieciešams vismaz %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Instalējot Tails radās kļūda"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Atsvaidzinoši izlaidumi..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Laidieni atjaunināti!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalēšana ir pabeigta!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Instalācija ir pabeigta."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nespēj uzmontēt ierīci"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -390,39 +398,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Lejupielāde pabeigta!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Lejupielāde neizdevās: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Variet vēlreiz mēģināt atjaunot lejupielādi"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Atlasīto datni nav iespējams lasīt. Lūdzu sakārtojiet atļaujas vai izvēlieties citu datni. "
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nespēj lietot atlasīto datni.  Iespējams, veiktos labāk, ja ISO tiktu pārvietots uz diska sakni (proti, C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s izvēlēts"
@@ -493,86 +510,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalēt Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Lai izpildītu Tails Instalētāju, Jums nepieciešams ISO attēls, kuru var lejuplādēt no Tails mājaslapas: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Instalēt"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "Instalēt Tails uz jauna USB diska."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "USB disks, uz kura instalējat, ir formatēts, un visi dati tiks izdzēsti."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Jaunināt"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "Jaunināt Tails USB disku uz ISO atēla versiju."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "Tiks saglabāta tā Tails USB diska, kuru jaunināt, šifrētā pastāvīgā krātuve. "
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Nepieciešama palīdzība? Lasiet <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edokument%C4%81c...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Instalēt klonējot"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "Kopējot Jūsu šobrīd izmantoto Tails sistēmu, instalēt Tails uz cita USB diska."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "Nav nokopēta šifrētā pastāvīgā krātuve Jūsu šobrīd izmantotajam Tails USB diskam. "
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Jaunināt klonējot"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "Jaunināt citu Tails USB disku uz Jūsu šobrīd izmantoto Tails versiju."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Jaunināt no ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "Jaunināt citu Tails USB disku uz ISO atēla versiju."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Nepieciešama palīdzība? Lasiet <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">dokumentāciju</a>"
diff --git a/mg/mg.po b/mg/mg.po
index 31659d549..fb1484645 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Malagasy (http://www.transifex.com/otf/torproject/language/mg/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/mi/mi.po b/mi/mi.po
index 93a8c6b1d..48cc51010 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Maori (http://www.transifex.com/otf/torproject/language/mi/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/mk/mk.po b/mk/mk.po
index 1f33a6cc7..1ba7f9c55 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ml/ml.po b/ml/ml.po
index 9ea0f347e..bd619c9b3 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/mn/mn.po b/mn/mn.po
index e97f46521..ca10c5821 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Mongolian (http://www.transifex.com/otf/torproject/language/mn/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/mr/mr.po b/mr/mr.po
index ddd5cec6b..011d6babc 100644
--- a/mr/mr.po
+++ b/mr/mr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 18:38+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po
index f48af137f..d60e1b9f1 100644
--- a/ms_MY/ms_MY.po
+++ b/ms_MY/ms_MY.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr "Tidak dapat membuang direktori daripada LiveOS sebelumnya: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Tidak dapat mencari peranti %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Tidak dapat memasukkan data kepada %(device)s, langkau."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Fail sistem tidak diketahui. Peranti anda mungkin harus diformatkan semula."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Fail sistem tidak disokong: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Tidak dapat melancarkan (mount) peranti: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Tiada titik pelancaran (mount) dijumpai"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Pengesahan fail sistem..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Tidak dapat mengubah label volume: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Pemasangan bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Buang %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s telah boleh di-boot"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Tidak dapat mencari partition"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Format %(device)s sebagai FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Menetapkan semula Master Boot Rekod %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Pengiraan SHA1 bagi %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sedang menyamaratakan data di dalam cakera..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pastikan USB anda sudah dipasang dan telah diformat ke fail sistem FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Fail sistem tidak disokong: %s\nSila buat salinan sokongan dan format USB anda dengan fail sistem FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Tidak dapat mencari"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "Pemasangan berjaya! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Amaran: Alat ini perlu dijalankan sebagai Administrator. Untuk melakukan ini, klik kanan pada ikon dan membuka Properties. Di bawah tab Compatibility, klik pada kotak "Run this program as an administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Pemasangan selesai!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Tidak dapat melancarkan peranti"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Muat turun berjaya!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Muat turun gagal:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Anda boleh mencuba lagi untuk meneruskan muat turun"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Fail yang dipilih tidak dapat dibaca. Sila betulkan permission fail tersebut atau pilih fail lain."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Tidak dapat menggunakan fail yang dipilih. Anda mungkin mempunyai nasib yang lebih baik jika anda pindahkan ISO anda ke direktori cakera keras anda (iaitu: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s dipilih"
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/mt/mt.po b/mt/mt.po
index 19fff1e37..fa50b8f9a 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Maltese (http://www.transifex.com/otf/torproject/language/mt/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/my/my.po b/my/my.po
index 34d3177fe..fcb5f2ab8 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/nah/nah.po b/nah/nah.po
index 7333d554b..495906d68 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Nahuatl (http://www.transifex.com/otf/torproject/language/nah/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/nap/nap.po b/nap/nap.po
index f025d07be..d8cb79401 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Neapolitan (http://www.transifex.com/otf/torproject/language/nap/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/nb/nb.po b/nb/nb.po
index 8864cd041..7f93b9014 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 20:22+0000\n"
-"Last-Translator: Allan Nordhøy epost@anotheragency.no\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -105,179 +105,179 @@ msgstr "Klarer ikke å fjerne katalog fra tidligere LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Kan ikke finne enhet %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Klarer ikke å skrive til %(device)s, hopper over."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Noen partisjoner på målenheten %(device)s er montert. De vil avmontert før installasjonsprosessen starter."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Ukjent filsystem. Din enhet må kanskje omformateres."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Ikke støttet filsystem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Ukjent GLib-unntak under montering av enhet: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Klarer ikke å laste enhet: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Ingen lastepunkter funnet"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Angir unmount_device for '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Avmonterer monterte filsystem på  '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Avmonterer '%(udi)s' på '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "%s eksisterer fortsatt etter frakoblingsforsøk"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partisjonerer enheten %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Oppdaterer egenskaper for systempartisjon %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Enheten '%(device)s' støttes ikke, rapporter som feil."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Prøver å fortsette uansett. "
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verifiserer filsystem…"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Kan ikke endre volum etikett: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installerer oppstartslaster…"
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Fant ikke '%s' COM32-modul"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Fjerner %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s kan brukes ved oppstart"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Klarer ikke å finne partisjon"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formaterer %(device)s til FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Fant ikke gptmbr.bin for SYSLINUX"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Leser utpakket MBR fra %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Kunne ikke lese utpakket MBR fra %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Tilbakestiller Master Boot Record av %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Stasjonen er en loopback, hopper over tilbakestilling av MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Kalkulerer SHA1 av %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synkroniserer data på stasjonen…"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Feil ved sondering av enhet"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Fant ingen enhet som støttes"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Sjekk at USB enheten din er koblet til og formatert med FAT filsystem"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Filsystemet er ikke støttet: %s\nTa en sikkerhetskopi av USB-enheten og formater med FAT-filsystem"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Klarte ikke å hente Win32_LogicalDisk; win32com spørringen ga ingen resultat"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Finner ikke"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -308,40 +308,48 @@ msgstr "Installasjonen er fullført! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails-installasjon mislyktes"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Advarsel: Dette verktøyet må kjøres som Administrator. For å gjøre det, høyreklikker du på ikonet og åpner Egenskaper. Under kompatibilitets fanen, kryss av i boksen for "Kjør dette programmet som administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails-installasjonskandidat"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Oppgrader"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Innstaller"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s enhet (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Ingen ISO-avbildning valgt"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Velg Tails ISO-avbildningen."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Fant ingen egnet enhet for installasjon av Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Plugg inn en USB-minnepinne eller SD-kort på minst %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -349,42 +357,42 @@ msgid ""
 "different model."
 msgstr "USB-minnepinnen "%(pretty_name)s" er satt opp som ikke-fjernbar av fabrikken og Tails klarer ikke å starte fra den. Prøv å installere på en annen modell."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Enheten "%(pretty_name)s" har for liten lagringsplass for å installere Tails (minst %(size)s Gb er påkrevet)"
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Feil under installasjon av Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Oppdaterer utgivelser…"
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Utgivelser oppdatert!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installasjonen er fullført!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Installasjonen er fullført."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Klarer ikke å laste enhet"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Bekreft hvilet USB-minne du vil installere på"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -392,39 +400,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s enhet (%(device)s)\n\nAll data på dette USB-minnet vil gå tapt."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s device (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Nedlasting fullført!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Nedlasting mislyktes: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Du kan prøve igjen for å gjenoppta din nedlasting"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Den valgte filen er uleselig. Sørg for at du har de nødvendige rettighetene eller velg en annen fil."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Kunne ikke bruke den angitte filen. Du kan være heldigere hvis du flytter ISOen din til root (f.eks: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s valgt"
@@ -495,86 +512,3 @@ msgstr "USB minne å installere på:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Reinstaller (slett all data)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "For å kjøre Tails-installasjonskandidaten trenger du en ISO-avbildning som kan lastes ned fra Tails sin nettside: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Innstaller"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installer Tails på en ny USB-minnepinne."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB-minnepinnen du prøver å installere på er formatert og all data har gått tapt."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Oppgrader"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Oppgrader en Tails-USB-minnepinne til versjonen fra en ISO-avbildning."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Det vedvarende lageret til en Tails-USB-minnepinne du oppgraderer er beholdt."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Behov for hjelp? Les <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edokumentasjonen</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Installer ved å klone"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Installer Tails på en annen USB-minnepinne ved å kopiere Tails-systemet du bruker for øyeblikket."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Det krypterte vedvarende lageret på en Tails-USB-minnepinne du bruker for øyeblikket har ikke blitt kopiert."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Oppgrader ved å klone"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Oppgrader en annen Tails-USB-minnepinne til samme versjon av Tails som du bruker for øyeblikket."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Oppgrader fra ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Oppgrader en annen Tails-USB-minnepinne til versjonen fra en ISO-avbildning."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Behov for hjelp? Les <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">dokumentasjonen</a>"
diff --git a/nds/nds.po b/nds/nds.po
index 9863d651f..36add8cc3 100644
--- a/nds/nds.po
+++ b/nds/nds.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Low German (http://www.transifex.com/otf/torproject/language/nds/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Künn Lööpwark %s nich finnen"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nich unnerstüttes Dateisystem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Överpröfe Dateisystem ..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pass op, dat dien USB-Stick insteckt is un mit ee'm FAT-Dateisystem formatert is"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nich unnerstüttes Dateisystem: %s\nBidde seker diene Daten un formateer dien USB-Stick mit ee'm FAT-Dateisystem."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Kann nicht finden"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Kann Gerät nicht einhängen"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Daalladen avsluten!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Daalladen ging in'n dutt:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Je künn versöken, dat Daalladen nohmal to starten un hoopen, dat dat an de glieke Stelle wietergeiht."
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ne/ne.po b/ne/ne.po
index b918ee71d..df15cb3fb 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/nl/nl.po b/nl/nl.po
index 2e0bdfab0..0d97d9372 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -112,179 +112,179 @@ msgstr "Kan map van vorige LiveOS niet verwijderen: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Kan apparaat %s niet vinden"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Niet in staat te schrijven naar %(device)s; wordt overgeslagen."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Sommige partities van het doelapparaat %(device)s zijn gekoppeld. Ze zullen ontkoppeld worden voordat het installatieproces wordt gestart."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Onbekend bestandssysteem. Het apparaat moet mogelijk geherformatteerd worden."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Bestandssysteem niet ondersteund: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Kan apparaat niet aankoppelen: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Geen aankoppelpunten gevonden"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Unmount_device voor '%(device)s' binnengaan"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Aangekoppeld bestandssysteem op '%(device)s' afkoppelen"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "'%(udi)s' op '%(device)s' afkoppelen"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Aankoppeling %s bestaat na afkoppeling"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitioneren van apparaat %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Bezig met het vernieuwen van eigenschappen van systeempartitie %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Niet-ondersteund apparaat '%(device)s', rapporteer alstublieft een bug."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Proberen om toch door te gaan."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Bestandssysteem verifiëren..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Niet in staat volumelabel te veranderen: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Bootloader installeren..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)s verwijderen"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s is al bootable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Kan geen partitie vinden"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s als FAT32 formatteren"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Master Boot Record van %s resetten"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Station is een loopback, MBR-reset wordt overgeslagen"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "SHA1 berekenen van %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Data synchroniseren op schijf..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Fout bij proben apparaat"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Niet in staat ondersteunde apparaten te vinden"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Verzeker je ervan dat jouw USB-stick is aangesloten en geformatteerd met het FAT bestandssysteem"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Niet ondersteund bestandssysteem: %s\nMaak een back-up en formatteer jouw USB stick met het FAT bestandssysteem."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Niet in staat Win32_LogicalDisk te verkrijgen; win32com query gaf geen zoekresultaat"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Niet gevonden"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -315,40 +315,48 @@ msgstr "Installatie afgerond! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Waarschuwing: Deze tool moet als beheerder worden uitgevoerd. Om dat te doen, klik met rechter muisknop op het icoon en open Eigenschappen. Onder de Compatibiliteit tab, check het "Start dit programma als beheerder" selectievakje."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -356,42 +364,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Het toestel "%(pretty_name)s" is te klein om Tails te installeren (hiervoor is minstens %(size)s GB vereist)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Bezig met vernieuwen van releases..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Releases zijn bijgewerkt!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installatie afgerond!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Kan apparaat niet aankoppelen"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -399,39 +407,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download voltooid!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Download mislukt: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Je kunt opnieuw proberen je download voort te zetten"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Het geselecteerde bestand is onleesbaar. Herstel de rechten of selecteer een ander bestand."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Kan geselecteerd bestand niet gebruiken.  Je kunt meer geluk hebben als je jouw ISO verplaatst naar het hoogste niveau van jouw schijf (bijv.: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s geselecteerd"
@@ -502,86 +519,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installeer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po
index 5bade58db..a143d0154 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 23:00+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Kan apparaat %s niet vinden"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Niet mogelijk om te schrijven naar %(device)s, overslaan."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Onbekend bestandssysteel. Uw apparaat dient geformatteerd te worden. "
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Niet ondersteund bestandsysteem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Apparaat %(device)s aan het partitioneren"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Toch proberen voortgaan."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Bestandsysteem verifiëren"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Bootloader aan het installeren..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "%(file)s aan het verwijderen"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Kan partitie niet vinden"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s aan het formatteren als FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Master Boot Record aan het resetten voor %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "De SHA1 van %s aan het berekenen"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Data op de schijf aan het syncroniseren..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Foutmelding bij het zoeken van het apparaat"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Kan geen ondersteund apparaat vinden"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Niet ondersteund bestandssyteem: %s\nGelieve een back-up uit te voeren en uw USB stick te formatteren naar het FAT bestandssysteem."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Kan niet vinden"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr "Installatie voltooid! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Het apparaat "%(pretty_name)s" is te klein om Tails op te installeren (minstens %(size)s GB is vereist)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Releases aan het refreshen..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installatie voltooid!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download klaar!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Download mislukt:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "U kan opnieuw proberen om uw download te hervatten"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Het geselecteerde bestand is onleesbaar. Gelieve de permissies te wijzigen of een ander bestand te selecteren."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s geselecteerd"
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installeer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/nn/nn.po b/nn/nn.po
index 3c7c679cf..abc268b03 100644
--- a/nn/nn.po
+++ b/nn/nn.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr "Kan ikkje fjerna katalog frå fyrre LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Finn ikkje eininga %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Kan ikkje skriva på %(device)s, hoppar yver."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Nokre inndelingar på måleinheiti %(device)s er monterte. Dei vil verte avmontera fyre innstalleringsgangen tek til."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Ukjend filsystem. Det kan vera at einheiti di treng å verta formatert um."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Ustøtta filsystem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Kan ikkje montera einheiti: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Fann ingen monteringspunkt"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Gjeng inn i unmount_device for '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Avmonterer monterte filsystem på '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Avmonterer '%(udi)s' på '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Montering %s finst etter avmontering"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Delar inn einheit %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Uppdaterer eigenskapar åt systeminndelingi: %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Ustøtta einheit '%(device)s', ver venleg og meld inn eit insekt."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Freistar å halda fram likevel."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Stadfestar filsystem..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Kan ikkje gjera um volumetikett: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installerer støvellastar..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Fjernar %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s allereie startbar"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Kan ikkje finna inndeling"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formaterer %(device)s som FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Nullstiller hovudinndelingssektor åt %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Drevet er ei attendekopling, hoppar yver MBR-nullstilling"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Reknar ut SHA1'en av %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Skapar samsvar med upplysingar på skivi..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Feil ved sondering av einheit"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Kan ikkje finna nokor støtta einheit."
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Sjå til at USB-lykelen din er plugga inn og formatert med FAT-filsystemet"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Ustøtta filsystem: %s\nVer venleg og ta kopi av USB-lykelen din og formater han med FAT-filsystemet."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Kan ikkje fenga Win32_LogicalDisk; win32com-fyrespurnad gav ingi resultat"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Finn ikkje"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "Installasjonen er fullført! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Åtvaring: Dette verktyet treng å køyra som Administrator. For å gjera dette, høgreklikk på ikonet og opn Eigenskapar. Under Kompatibilitet-fanen, kryss av "Køyr dette programmet som administrator"-boksen."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Einheiti "%(pretty_name)s" er for lita til å installere Tails på (minst %(size)s GB er påkravt)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Oppdaterer versjonane "
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Versjonane oppdaterte!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installering fullførd"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Kan ikkje montera einheiti"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Nedlastinga er ferdig!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Mislukka nedlasting:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Du kan prøva å halda fram med nedlastinga"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Den valde fili er ulesbar. Ver venleg og fiks løyvi hennar eller vel ei onnor fil."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Kan ikkje nytta den valde fili. Du hev kanskje betre hell um du flyttar ISO'en din åt roti av drevet ditt (t.d. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s vald(e)"
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/nso/nso.po b/nso/nso.po
index 4ec2a8298..a761dadc1 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Northern Sotho (http://www.transifex.com/otf/torproject/language/nso/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/oc/oc.po b/oc/oc.po
index 73ec0358b..6b8a88eb1 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/otf/torproject/language/oc/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/om/om.po b/om/om.po
index 574f4a654..d86be77be 100644
--- a/om/om.po
+++ b/om/om.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Oromo (http://www.transifex.com/otf/torproject/language/om/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/or/or.po b/or/or.po
index 50af9d863..4fceb4356 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/pa/pa.po b/pa/pa.po
index 74a9ccfdd..b90cc26ae 100644
--- a/pa/pa.po
+++ b/pa/pa.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -103,179 +103,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "ਜੰਤਰ %s ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਫਾਇਲ ਸਿਸਟਮ: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "ਫਾਇਲ ਸਿਸਟਮ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "...ਬੂਟ ਲੋਡਰ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "ਜਾਂਚ ਕਰੋ ਕੀ ਤੁਹਾਡੀ USB ਪਲੱਗਇਨ ਕੀਤੀ ਹੈ ਅਤੇ FAT ਫਾਇਲ ਸਿਸਟਮ ਨਾਲ ਫਾਰਮੈਟ ਕੀਤੀ ਹੈ"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "ਗ਼ੈਰਸਹਾਇਕ ਫਾਇਲ ਸਿਸਟਮ: %s\nਬੈਕਅੱਪ ਲਵੋ ਤੇ ਆਪਣੀ USB ਨੂੰ FAT ਫਾਇਲ ਸਿਸਟਮ ਨਾਲ ਫਾਰਮੈਟ ਕਰੋ।"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -306,40 +306,48 @@ msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਪੂਰੀ ਹੋਈ! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -347,42 +355,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਪੂਰੀ ਹੋਈ!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "ਯੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -390,39 +398,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "ਡਾਊਨਲੋਡ ਫੇਲ੍ਹ: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "ਤੁਸੀਂ ਆਪਣੇ ਡਾਊਨਲੋਡ ਮੁੜ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ਚੁਣੀ"
@@ -493,86 +510,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "ਟੇਲਜ਼ ਇੰਸਟਾਲ ਕਰੋ"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/pap/pap.po b/pap/pap.po
index e7296128a..3ded8a337 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Papiamento (http://www.transifex.com/otf/torproject/language/pap/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/pl/pl.po b/pl/pl.po
index e4f7765ce..8949ce937 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -109,179 +109,179 @@ msgstr "Nie można usunąć katalogu poprzedniego systemu operacyjnego Live: %(m
 msgid "Cannot find device %s"
 msgstr "Nie można odnaleźć urządzenia %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nie można zapisać na %(device)s, pomijam"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Niektóre partycje na wybranym przez Ciebie urządzeniu %(device)s są zamontowane. Zostaną one odłączone przed zaczęciem procesu instalacji."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Nieznany system plików. Urządzenie może wymagać ponownego sformatowania."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nieobsługiwany system plików: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nie można zamontować urządzenia: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nie znaleziono punktów instalacji"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Odmontowywanie urządzenia '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Odmontowywanie systemów plików na '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Odmontowywanie '%(udi)s' z '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "%s istnieje mimo demontowania"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partycjonowanie urządzenia/urządzeń %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Aktualizowanie właściwości partycji systemowej %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nieobsługiwane urządzenie '%(device)s', proszę zgłosić błąd."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Próbujemy kontynuować."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Sprawdzanie systemu plików..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nie można zmienić etykiety: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instalowanie programu startowego..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Usuwanie %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s jest już startowa"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nie można odnaleźć partycji"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatowanie %(device)s jako FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Reset głównego sektora startowego %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Napęd jest urządzeniem loopback, pomijanie przywracania MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Obliczanie sumy kontrolnej SHA1 pliku %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronizowanie danych na dysku..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Błąd podczas wykrywania urządzenia"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nie można znaleźć żadnego obsługiwanego urządzenia"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Proszę upewnić się, że klucz USB jest podłączony i sformatowany w systemie plików FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nieobsługiwany system plików: %s\nProszę wykonać kopię zapasową i sformatować klucz USB w systemie plików FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nie można uzyskać Win32_LogicalDisk; zapytanie win32com nie zwróciło żadnych wyników"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nie znaleziono"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -312,40 +312,48 @@ msgstr "Zakończono instalację! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Ostrzeżenie: to narzędzie musi być uruchomione jako administrator. Aby to zrobić, należy nacisnąć prawym przyciskiem myszy ikonę i otworzyć Właściwości. W karcie Zgodność należy zaznaczyć pole wyboru "Uruchom ten program jako administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -353,42 +361,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Urządzenie "%(pretty_name)s" ma zbyt mało miejsca dla systemu Tails (wymagane jest przynajmniej %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Odświeżanie wersji..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Wersje zaktualizowane!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Zakończono instalację!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nie można zamontować urządzenia"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -396,39 +404,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Pobieranie ukończone!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Pobieranie nie powiodło się: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Możesz spróbować ponownie, aby wznowić pobieranie"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Nie można odczytać wybranego pliku. Proszę poprawić prawa dostępu do niego lub wybrać inny plik."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nie można użyć wybranego pliku.  Łatwiej będzie po przeniesieniu pliku ISO do głównego katalogu napędu (np. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "Wybrano %(filename)s"
@@ -499,86 +516,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Zainstaluj Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/pms/pms.po b/pms/pms.po
index 48f4b3e40..cbf70a59d 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Piemontese (http://www.transifex.com/otf/torproject/language/pms/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ps/ps.po b/ps/ps.po
index c9caa781a..85ffe829f 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Pushto (http://www.transifex.com/otf/torproject/language/ps/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/pt/pt.po b/pt/pt.po
index 1a4ecb8a4..784eb9e18 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -113,179 +113,179 @@ msgstr "Não é possível remover a diretoria do LiveOS anterior: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Não é possível encontrar %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Não é possível gravar no %(device)s, a ignorar."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algumas partições do dispositivo %(device)s estão montadas. Elas serão desmontadas antes que o processo de instalação comece."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistema de ficheiros desconhecido. Poderá ter que reformatar o seu dispositivo."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistema de ficheiros não suportado: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Não é possível montar o dispositivo: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Não foram encontrados pontos de montagem"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "A entrar em unmount_device para '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "A desmontar o sistema de ficheiros montados no '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "A desmontar '%(udi)s' no '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "O ponto de montagem %s existe depois de desmontado"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "A particionar o dispositivo %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "A atualizar as propriedades da partição do sistema %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Dispositivo '%(device)s' não suportado, por favor, comunique um bug."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "A tentar continuar de qualquer forma."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "A verificar o sistema de ficheiros ..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Não é possível alterar o nome do volume: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "A instalar o carregador de arranque..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "A remover %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s já é de arranque"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Não foi possível encontrar a partição"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "A formatar o %(device)s como FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "A reiniciar o 'Master Boot Record' de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "A unidade é um 'loopback', a ignorar o reinício do MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "A calcular o SHA1 de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "A sincronizar os dados no disco..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Erro ao examinar o dispositivo"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Não foi possível encontrar um dispositivo suportado"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Certifique-se que a pen USB está ligada e formatada com o sistema de ficheiros FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Sistema de ficheiros não suportado: %s\nPor favor, efetue uma cópia de segurança e formate a sua pen USB com o sistema de ficheiros FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Não foi possível obter o Win32_LogicalDisk; a consulta win32com não devolveu quaisquer resultados"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Não é possível encontrar"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -316,40 +316,48 @@ msgstr "Instalação completa! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Aviso: esta ferramenta precisa de ser executada como um Administrador. Para o fazer, clique direito no ícone e abra as Propriedades. No separador 'Compatibilidade', selecione "Executar como Administrador"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -357,42 +365,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "O dispositivo "%(pretty_name)s" é muito pequeno para instalar o Tails (é necessário pelo menos %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "A atualizar os lançamentos..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Lançamentos atualizados!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalação completa!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Não é possível montar o dispositivo"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -400,39 +408,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Transferência completa!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "A transferência falhou:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Pode tentar novamente para retomar a sua transferência"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "O ficheiro selecionado não é legível. Por favor corrija as permissões ou selecione outro ficheiro."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Não é possível utilizar o ficheiro selecionado. É capaz de ter mais sorte se mover o seu ficheiro ISO para a raiz da sua unidade (ex.: C:\)."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s selecionado"
@@ -503,86 +520,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalar o Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 8c0be3eae..2bb2c8bfe 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -121,179 +121,179 @@ msgstr "Não foi possível remover um diretório do sistema operacional Live ant
 msgid "Cannot find device %s"
 msgstr "Não foi possível localizar o dispositivo %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Não foi possível gravar no dispositivo %(device)s. Pulando"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Algumas partições do dispositivo indicado %(device)s estão montadas. Elas serão desmontadas antes do processo de instalação iniciar."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistema de arquivos desconhecido. Talvez o seu dispositivo precise ser formatado novamente."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistema de arquivos não possui suporte: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Exceção GLib desconhecida ao tentar montar o dispositivo: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Não foi possível montar o dispositivo: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nenhum ponto de montagem encontrado"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Adicionando dispositivo_desmontado ao '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Desmontando os sistemas de arquivos montados em '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Desmontando '%(udi)s' no (s) '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "O ponto de montagem %s existe mesmo após ter sido desmontado"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Particionando o dispositivo %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Atualizando as propriedades da partição de sistema %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Dispositivo incompatível '%(device)s', por favor reporte o bug."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Tentando continuar de qualquer maneira."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verificando o sistema de arquivos..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Não foi possível alterar o rótulo do dispositivo: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instalando reinicializador..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Não foi possível encontrar o módulo '%s' COM32 "
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Removendo %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s pronto para iniciar"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Não foi possível localizar a partição"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatando %(device)s como FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Não foi possível encontrar syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lendo MBR extraído de %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Não foi possível ler o MBR extraído de %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Reinicializando o Master Boot Record (MBR) de %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "O dispositivo é um loopback. Pulando a reinicialização do MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculando o SHA1 (Secure Hash Algorithm) de %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sincronizando dados no disco..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Erro ao sondar o dispositivo"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Não foi possível encontrar nenhum dispositivo compatível"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Certifique-se de que a sua memória USB esteja conectada e formatada com o sistema de arquivos FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Sistema de arquivos não possui suporte: %s\nPor favor, faça um backup e formate a sua memória USB com o sistema de arquivos FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Não foi possível obter Win32_LogicalDisk; a consulta com win32com não obteve nenhum resultado"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Não foi possível localizar"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -324,40 +324,48 @@ msgstr "Instalação concluída! (%s)"
 msgid "Tails installation failed!"
 msgstr "A instalação do Tails falhou!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Atenção: Esta ferramenta deve ser executada pelo Administrador. Para isso, clique com o botão direito no ícone e abra a função 'Propriedades'. Na janela Compatibilidade, marque a opção "Executar este programa como Administrador"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails Installer"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Atualizar"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Instalar"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Não foi encontrado nenhum dispositivo adequado à instalação do Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Por favor, plugue um volume USB ou um cartão SD de ao menos   %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -365,42 +373,42 @@ msgid ""
 "different model."
 msgstr "A memória USB "%(pretty_name)s" está configurado como 'não-removível' pelo fabricante e o Tais não funcionará nele. Por favor, tente instalar Tails em um outro modelo de memória USB.."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "O dispositivo "%(pretty_name)s" é muito restrito para instalar Tails (no mínimo, %(size)s GB são necessários)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Um erro ocorreu durante a instalacao do Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Atualizando versões..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Versões atualizadas!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalação concluída!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Instalação concluída."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Não foi possível montar o dispositivo"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -408,39 +416,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download concluído!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "O download falhou: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Você pode tentar recomeçar o download novamente"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "O arquivo selecionado não pode ser lido.  Por favor, corrija suas permissões ou selecione outro arquivo."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Não foi possível utilizar o arquivo selecionado. Talvez você tenha mais sorte se mover a imagem ISO para a raiz do seu dispositivo (por exemplo, `C:\')"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s selecionado"
@@ -511,86 +528,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalar Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Para executar o Tails Installer, você precisa de uma imagem ISO, que pode ser baixada do site do Tails:  <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Instalar"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Instalar Tails em um novo volume USB."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• O volume USB que você está usando será formatado e todos os dados serão perdidos."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Atualizar"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Atualizar o volume USB Tails para uma versão em imagem ISO."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Após a atualização do volume USB Tails, o volume de armazenamento criptografado persistente foi preservado."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Precisa de ajuda?Leia a <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumenta%C3%A7...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Instalação por clonagem"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Instalar o Tails em um outro volume USB, copiando o sistema Tails que você está utilizando."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "•  Não foi feita cópia do volume de armazenamento criptografado persistente do volume USB Tails que você está usando."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Atualização por clonagem"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Atualizar um outro volume USB Tails para a mesma versão do Tails que você está usando atualmente."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Atualizar a partir de uma ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Atualizar um outro volume USB Tails para a versão de uma imagem ISO."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Precisa de ajuda?Leia a <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentação</a>"
diff --git a/ro/ro.po b/ro/ro.po
index 3d9d9b731..fb2c45f5f 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -106,179 +106,179 @@ msgstr "Nu pot sterge folder din fostul LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Nu găsesc device %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nu pot scrie pe %(device)s, ignor."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "filesystem necunoscut. Aparatul ar putea să aibă nevoie să fie reformatat."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "filesystem nesuportat: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nu pot monta device: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Nu am găsit puncte de montare"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Introduc unmount_device pentru '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Demontez '%(udi)s' pe '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Montarea %s există după demontare"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partiționez device %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Actualizez proprietățile partiției de sistem %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Device nesuportat '%(device)s', raportați un bug."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verific filesystem..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nu pot schimba eticheta volumului: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Instalez bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Șterg %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s deja bootabil"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nu pot găsi partiția"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatez %(device)s ca FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Resetez Master Boot Record al %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Drive este un loopback, ignor MBR reset"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculez SHA1 a %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sincronizez datele pe disc..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Eroare probing device"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nu pot găsi un device suportat"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Asigurați-vă că cheia USB este pus și formatat cu filesystem FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "filesystem nesuportat: %s\nFaceți backup și formatați cheia USB cu filesystem FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nu pot obține Win32_LogicalDisk; win32com query nu a întors nici un rezultat"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nu găsesc"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -309,40 +309,48 @@ msgstr "Instalare completă! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Avertisment: Acest instrument trebuie să fie rulat ca administrator. Pentru a face acest lucru, dați clic dreapta pe pictogramă și deschideți Proprietăți. Sub fila Compatibilitate, bifați căsuța "Rulați acest program ca administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -350,42 +358,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Dispozitivul "%(pretty_name)s" are prea putina memorie libera pentru a instala Tails (cel putin %(size)s GB este necesar)"
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Împrospătez versiunile..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Versiuni actualizate!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalare completa!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nu pot monta aparatul"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -393,39 +401,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Descărcare completă!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Descărcare eșuată!"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Puteți să reîncercați să reporniți downloadul"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Fișierul ales nu poate fi citit. Corectați accesul sau alegeți altul."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nu pot folosi fișierul ales. Puteți avea mai mult noroc mutînd ISO în folderul rădăcină (ex. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ales"
@@ -496,86 +513,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalez Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ru/ru.po b/ru/ru.po
index e1aa0a3b1..cf0729caa 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -120,179 +120,179 @@ msgstr "Невозможно удалить директорию из преды
 msgid "Cannot find device %s"
 msgstr "Устройство %s не найдено"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Невозможно записать на %(device)s, пропускаю."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Некоторые разделы целевого устройства %(device)s примонтированы. Они будут отмонтированы перед началом установки."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Неизвестная файловая система. Ваше устройство нуждается в переформатировании."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Неподдерживаемая файловая система: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Невозможно смонтировать устройство %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Нет точек монтирования"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Открытие непримонтированного устройства для  '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Размонтирование файловых систем на '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Размонтирование '%(udi)s' на '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Точка монтирования %s существует во время монтирования"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Разметка устройства %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Обновление свойств системного раздела %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Неподдерживаемое устройство '%(device)s', пожалуйста, сообщите об ошибке."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Попытка продолжить все равно."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Проверка файловой системы..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Невозможно изменить метку тома: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Установка загрузчика..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Removing %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s уже является загрузочным"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Невозможно найти раздел"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Форматирование %(device)s в FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Не удается найти syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Сброс главной загрузочной записи %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Этот диск является петлевым устройством, пропускаем сброс MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Вычисление SHA1 от %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Сихронизирую данные на диске..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Ошибка зондирования устройства"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Невозможно найти поддерживаемое устройство"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Убедитесь, что USB-устройство подключено и отформатировано (FAT)"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Неподдерживаемая файловая система: %s\nПожалуйста, сделайте резервную копию данных и отформатируйте USB-устройство в файловую систему FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Невозможно получить Win32_LogicalDisk; win32com ничего не вернул"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Невозможно найти"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -323,40 +323,48 @@ msgstr "Установка завершена! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Внимание: Для работы требуются права Администратора. Что бы получить их, нажмите правой клавишей на иконку приложения и откройте Свойства. В вкладке Совместимость, поставьте галочку на "Выполнять эту программу от имени администратора"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -364,42 +372,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Устройство "%(pretty_name)s" слишком мало для установки (нужно как минимум %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Обновление списка выпусков..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Релизы обновлены!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Установка завершена!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Невозможно смонтировать устройство"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -407,39 +415,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Загрузка завершена!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Ошибка загрузки: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Вы можете попробовать продолжить загрузку"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Выбранный файл нечитабелен. Исправьте файл или выберите другой."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Невозможно использовать указанный файл. Попробуйте переместить ISO в корень диска (например C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "Выбрано %(filename)s"
@@ -510,86 +527,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Установить Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ru@petr1708/ru@petr1708.po b/ru@petr1708/ru@petr1708.po
index b91360373..972478593 100644
--- a/ru@petr1708/ru@petr1708.po
+++ b/ru@petr1708/ru@petr1708.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/otf/torproject/language/ru@petr1708/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/scn/scn.po b/scn/scn.po
index 045d3aa09..279391706 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Sicilian (http://www.transifex.com/otf/torproject/language/scn/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sco/sco.po b/sco/sco.po
index e1963f41e..f4e688e18 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Scots (http://www.transifex.com/otf/torproject/language/sco/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po
index 97a6e03cb..1f0dacea0 100644
--- a/si_LK/si_LK.po
+++ b/si_LK/si_LK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:05+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr "පෙර LiveOS එකෙන් නාමාවලි ඉවත් ක
 msgid "Cannot find device %s"
 msgstr "උපාංගය සොයාගත නොහැක%s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "ලිවීමට නොහැක %(device)s, මගහරිමින්."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "හදුනානොගත් ගොනු පද්ධතිය.  ඔබගේ ආම්පන්නය නැවත සැකසීමට අවශ්‍ය වනු ඇත."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "ආධාරක නොවෙන ගොනු පද්ධති: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "උපකරණය මවුන්ට් කිරීමට නොහැක : %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Mount points කිසිවක් හමුවී නොමැත"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "මවුන්ට් කිරීම %s ප්‍රතිමවුන්ට් කිරීමෙන් පසුවද පවතී"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "ගොනු පද්ධතිය තහවුරු කරමින්"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "දිගහැරුමේ ලේබලය වෙනස් කිරීමට නොහැක: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Bootloader ස්ථාපනය කරමින්..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "ඉවත්කරමින් %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%sදැනටමත් bootable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "බෙදුම් පත සොයාගත නොහැක "
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "සකසමින් %(device)s as FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Master Boot Record නැවත සකසමින් %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "ධාවකය ලුපයකි, MBR reset මගහරිමින් "
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "%s හි SHA1ගණනය කරමින්"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "තැටියේ දත්ත සමමුහුර්ත කරමින්..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "ආම්පන්න එෂණයේ දෝෂයක්"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "USB යතුර සම්බන්ධ කර FAT ගොනු පද්ධතිය සමග සැකසු බවට තහවුරු කරන්න"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "ආධාර නොකරන ගොනු පද්ධතිය: %s\nකරුණාකර ඔබගේ USB යතුර FAT ගොනු පද්ධතිය සමග රක්ෂණය කර සකසන්න ."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "ගැනීමට නොහැකි වුයේ Win32_LogicalDisk; win32com විමසුම ප්‍රථිපල කිසිවක් නැවත ප්‍රවේශ කලේ නැත"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "සොයාගත නොහැක "
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "ස්ථාපනය කිරීම සම්පුරණයි! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "අවවාදය:  This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the "Run this program as an administrator" box."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "දිගහැරුම් නැවත ප්‍රාණවත් කරමින්..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "දිගහැරුම් යාවත්කාලීන කර ඇත !"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "ස්ථාපනය සම්පුර්ණය!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "උපකරණය මවුන්ට් කිරීමට නොහැක "
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "භාගත කිරීම සාර්ථකයි!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "භාගත කිරීම අසාර්ථකයි!"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "නැවතත් ඔබගේ බාගත කිරීම ආරම්භ කිරීමට ඔබට උත්සාහ කල හැකිය "
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "තෝරාගත් ගොනුව කියවිය නොහැක. කරුණාකර එහි අවසර සකස් කර හෝ වෙනත් ගොනුවක් තෝරාගන්න."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "තෝරාගත් ගොනුව භාවිතා කිරීමට නොහැක.  ඔබේ ISO එක ධාවකයේ මූලය වෙත යැවීම වඩාත්  සුදුසුය.(ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s තෝරාගන්නා ලදී "
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sk/sk.po b/sk/sk.po
index 7233b7d54..8254ff0d8 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -108,179 +108,179 @@ msgstr "Nedá sa odobrať adresár z predošlého LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Nie je možné nájsť zariadenie %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nedá sa zapísať na %(device)s, preskakujem."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Sú pripojené niektoré partície cieľového zariadenia %(device)s. Pred začatím inštalácie budú odpojené."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Neznámy súborový systém. Vaše zariadenie bude potrebné preformátovať."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepodporovaný súborový systém: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nedá sa pripojiť zariadenie: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Neboli nájdené žiadne body pripojenia"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Vkladá sa  unmount_device pre zariadenie %(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Odpájajú sa pripojené súborové systémy na zariadení '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Odpája sa '%(udi)s' na zariadení '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Pripojenie %s existuje po odpojení"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Rozdeľuje sa zariadenie %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Aktualizácia vlastností systémovej partície %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nepodporované zariadenie  '%(device)s', prosíme nahláste túto chybu."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Snažiť sa napriek tomu pokračovať."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Kontroluje sa súborový systém..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nie je možné zmeniť menovku zväzku: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Inštaluje sa bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Odoberám %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s je už bootovateľné."
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nedá sa nájsť partícia"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formátujem %(device)s ako FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Resetujem hlavný bootovací záznam %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Zariadenie je slučka, preskakujem resetovanie hlavného bootovacieho záznamu"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Počítam SHA1 %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronizujem údaje na disk..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Chyba pri snímaní zariadenia"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nenašlo sa žiadne podporované zariadenie"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Skontrolujte, či je USB kľúč pripojený a naformátovaný na súborový systém FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepodporovaný súborový systém: %s\nSpravte zálohu a naformátujte USB kľúč na súborový systém FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nedá sa získať Win32_LogicalDisk; win32com neodpovedá na požiadavku"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nepodarilo sa nájsť"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -311,40 +311,48 @@ msgstr "Inštalácia je dokončená! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Upozornenie: Tento nástroj je potrebné spustiť ako Administrátor. Učiníte tak tým, že kliknete pravým tlačidlom na ikonu a vyberiete Vlastnosti. Pod záložkou Kompatibilita označte políčko "Spustiť tento program ako administrátor"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -352,42 +360,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Obnovujú sa vydania.."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Vydania aktualizované!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Inštalácia dokončená!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nie je možné pripojiť zariadenie"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -395,39 +403,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Sťahovanie dokončené!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Sťahovanie zlyhalo:  "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Môžete skúsiť znovu spustiť sťahovanie"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Zvolený súbor je nečitateľný. Prosíme opravte jeho oprávnenia alebo si zvoľte iný súbor."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nedá sa použiť vybraný súbor. Skúste presunúť ISO do Vášho koreňového adresára (napr. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s vybraný"
@@ -498,86 +515,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Nainštalovať Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index 7cf1bdd46..17a219e7c 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 18:52+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -103,179 +103,179 @@ msgstr "Nemôžem ostrániť priečinok z predchádzajúceho LiveOS: %(message)s
 msgid "Cannot find device %s"
 msgstr "Nie je možné nájsť zariadenie %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nie je možné uskutočniť zápis na %(device)s, preskakujem."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Niektoré oddiely, pripojené na cieľovom zariadení %(device)s sú pripojené. Pred začatím inštalačného procesu budú odpojené."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Neznámy súborový systém. Vaše zariadenie bude nutné opäť sformátovať."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepodporovaný súborový systém: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nemôžem pripojiť zariadenie: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Neboli nájdené žiadne body pripojenia"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Spúšťa sa unmount_device pre '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Odpája sa pripojený súborový systém  '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Odpája sa '%(udi)s' na '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Pripojenie %s existuje po odpojení"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Vytváranie oddielov na zariadení %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Aktualizujem vlastnosti systémového oddielu %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nepodorované zariadenie '%(device)s', prosím nahláste chybu."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Pokušam sa napriek tomu pokračovať."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Overujem súborový systém..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nie je možné zmeniť menovku %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Inštalujem bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Odstraňovanie %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s je bootovateľné"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Nie je možné nájsť oddiel"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formátovanie %(device)s ako FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Resetujem hlavný bootovací záznam %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Zariadenie je loopback, preskakujem MBR reset"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Prebieha výpočet SHA1 pre %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronizujem dáta na disku..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Chyba pri skúšaní zariadenia"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Nemôžem nájsť žiadne podporované zariadenie"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Uistite sa, že Váš USB kľúč je pripojený a naformátovaný na systém FAT."
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepodporovaný súborový systém: %s\nProsím zálohujte a sformátujte Váš USB kľúč súborovým systémom FAT"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nemôžem získať Win32_LogicalDisk; win32com nevrátil žiadne výsledky"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Nie je možné nájsť"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -306,40 +306,48 @@ msgstr "Inštalácia kompletná! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Varovanie: Tento nástroj  je nutné spustiť ako Administrátor. Kliknite pravým tlačidlom na ikonu a otvorte Vlastnosti. Pod záložkou kompatibilita zaškrtnite položku "Program spustiť ako administrátor"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -347,42 +355,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Zariadenie "%(pretty_name)s" je príliš malé na inštaláciu Tails (je vyžadovaných minimálne %(size)s GB)"
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Obnovovanie verzií..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Verzie obnovené!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Inštalácia kompletná!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nemôžem pripojiť zariadenie"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -390,39 +398,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Preberanie kompletné!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Preberanie zlyhalo:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Môžete sa pokúsiť o pokračovanie sťahovania"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Vybraný súbor je nečitaťeľný. Prosím upravte oprávnenia alebo vyberte iný súbor."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nie je možné použiť zvolený súbor. Možno pomôže, ak presuniete Váš ISO súbor do koreňového disku (napr. C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s označených"
@@ -493,86 +510,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Inštalácia Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sl/sl.po b/sl/sl.po
index c93f1919c..1e84553cc 100644
--- a/sl/sl.po
+++ b/sl/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:32+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr "Namestitev končana! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Namestitev končana!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Naprave ni mogoče namestiti"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sl_SI/sl_SI.po b/sl_SI/sl_SI.po
index f8bed65e3..7a9f818d3 100644
--- a/sl_SI/sl_SI.po
+++ b/sl_SI/sl_SI.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 18:52+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/otf/torproject/language/sl_SI/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -104,179 +104,179 @@ msgstr "Nemogoče odstraniti imenik predhodne LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Ne najdem naprave %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nemogoče zapisovanje na %(device)s, preskočim."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Nekatere particije na ciljni napravi %(device)s so vpete. Potrebno jih je odpeti pred začetkom namestitve. "
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Nepoznan datotečni sistem. Naprava mora biti formatirana."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepodprt datotečni sistem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nemogoče priklopiti napravo: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Ne najdem priklopne točke"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Vnašanje odklopljene_naprave za '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Odklapljanje priklopljenega datotečnega sistema na '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Odklapljanje '%(udi)s' na '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Priklop %s obstaja po odklopu"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Delitev naprave %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Posodabljanje lastnosti sistemske particije %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Nepodprta naprava '%(device)s', prosim javite hrošča."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Poskušam vseeno nadaljevati."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Preverjanje datotečnega sistema"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nemogoče spremeniti nalepko nosilca: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Namestitev zaganjalnika ..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Odstranjevanje %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s že zagonska"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Ne najde particije"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatiranje %(device)s kot FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Ponastavitev MBR %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Pogon je v povratni zanki, preskoči reset MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Preračunavanje SHA1 od %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Sinhronizacija podatkov na disk"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Napaka sondirane naprave"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Ne najde nobene podprte naprave"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Prepričajte se, da je USB vtaknjen in formatiran z FAT sistemsko datoteko"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepodprt datotečni sistem: %s\nProsim formatirajte USB z FAT datotečnim sistemom."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Nemogoče dobiti Win32_LogicalDisk; win32com poizvedba ni vrnila nobenih rezultatov"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Ne najdem"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -307,40 +307,48 @@ msgstr "Namestitev končana! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Opozorilo: To orodje mora biti zagnano kot Administrator. Da to naredite, kliknite desno na ikono in odprite lastnosti. V tab-u združljivost označite " Zaženi kot Administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -348,42 +356,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Naprava "%(pretty_name)s" vsebuje premalo prostora za namestitev Tails (najmanj %(size)s GB je priporočeno)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Osveževanje izdaje..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Izdaje posodobljene!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Namestitev končana!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nemogoče priklopiti napravo"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -391,39 +399,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Prenos končan!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Neuspel prenos:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Ponovno poskusite nadaljevati vaš prenos"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Izbrana datoteka je nečitljiva. Popravite dovoljenje ali izberite drugo datoteko."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Nemogoče uporabiti izbrano datoteko. Več sreče boste imeli s premikom vaše ISO v koren pogona (npr.: C:\ )"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s izbrana"
@@ -494,86 +511,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Namesti Sledi"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sn/sn.po b/sn/sn.po
index 2a36cff47..c09778ae8 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Shona (http://www.transifex.com/otf/torproject/language/sn/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/so/so.po b/so/so.po
index f99a85082..58f9faba1 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Somali (http://www.transifex.com/otf/torproject/language/so/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/son/son.po b/son/son.po
index ae1b7a423..b28a69fe1 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sq/sq.po b/sq/sq.po
index 419e4d8c0..060ff3e8e 100644
--- a/sq/sq.po
+++ b/sq/sq.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr "S'mund të hiqet direktoria nga LiveOS i mëparshëm: %(message)s"
 msgid "Cannot find device %s"
 msgstr "S'mund të gjendet pajisja %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "S'mund të shkruhet tek %(device)s, duke e kapërcyer."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Disa njësi të ndara të pajisjes së synuar %(device)s janë montuar. Ato do të çmontohen përpara se të nisë procesi i instalimit."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Sistem i panjohur skedarësh. Pajisja juaj mund të ketë nevojë për riformatim."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Sistem skedarësh i pa mbështetur: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "S'mund të montohet pajisja: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "S'u gjet asnjë pikë montimi"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Duke futur çmontoni_pajisjen për '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Çmontimi i sistemit të skedarëve të montuar në '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Çmontimi i '%(udi)s' në '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Montimi i %s është i pranishëm pas çmontimit"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Pajisja ndarëse %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Përditësimi i vetive të ndarjes së sistemit %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Pajisje '%(device)s' e pamontuar. Ju lutemi raportoni një gabim."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Duke u rrekur për të vazhduar gjithsesi."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Duke verifikuar sistemin e skedarëve..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "S'mund të ndryshohet etiketa e volumit: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Duke instaluar nisësin..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Largimi i %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s plotësisht funksional"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "S'mund të gjendet njësia e ndarjë"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Duke e formatuar %(device)s si FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Rivendosja e Regjistrit të Nisjes Kryesore për %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Pajisja është riciklike, duke shmangur rivendosjen e MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Duke përllogaritur SHA1 të %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Duke sinkronizuar të dhënat në disk..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Pajisje për sondimin e gabimit"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "S'mund të gjendet asnjë pajisje e pranuar"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Sigurohuni që USB-ja juaj të jetë e ngulur dhe e formatuar me sistemin e skedarëve FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Sistem skedarësh i papranueshëm: %s\nJu lutemi ruajeni dhe formatoni diskun tuaj USB, me sistemin e skedarëve FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "S'mund të merret Win32_LogicalDisk; pyetje win32com nuk ktheu asnjë rezultat"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "S'mund të gjendet"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "Instalimi u krye! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Kujdes: Ky mjet lypset të ekzekutohet si një Administrator. Për ta bërë këtë, klikoni me të djathtën mbi ikonë dhe hapni Vetitë. Tek butoni Përputhshmëria, shenjoni kutizën "Ekzekutojeni këtë program si administrator"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Pajisja "%(pretty_name)s" është shumë e vogël për të instaluar Tails (duhen të paktën %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Duke rifreskuar versionet..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Versionet u përditësuan!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalimi u krye!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "S'mund të montohet pajisja"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Shkarkimi u krye!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Shkarkimi dështoi:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Mund të provoni sërish që ta rinisni shkarkimin tuaj."
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Skedari i përzgjedhur është i palexueshëm. Ju lutemi ndreqini lejet e tij, ose përzgjidhni një skedar tjetër."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "S'mund të përdoret skedari i përzgjedhur. Mund të jeni më me fat nëse e lëvizni ISO-n tuaj, tek rrënja e diskut tuaj (psh: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s e përzgjedhur"
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instaloni Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sr/sr.po b/sr/sr.po
index a5e47b180..b9436a233 100644
--- a/sr/sr.po
+++ b/sr/sr.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -106,179 +106,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Ne mogu da pronadjem uredjaj %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Filesystem nepodrzan: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Ne moguce pokrenuti uredjaj: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Filesystem verifikacija..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Brisem %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s већ bootable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Ne moguce pronaci particiju."
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatiram %(device)s kao FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pobrinite se da je vas USB uredjaj utaknut i formatiran sa FAT sistemom."
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Filesystem nepodrzan: %s\nNapravite rezervnu kopiju i formatirajte vas USB uredjaj sa FAT sistemom."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Ne mogu da nadjem"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -309,40 +309,48 @@ msgstr "Instalacija zavrsena! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Upozorenje: Ovaj uredjaj mora biti pokrenut kao Administrator. Da uradite ovo, kliknite desnim klikom na ikonicu i izaberite Properties. Pod Compatability opcijom, odaberite "Run this program as an administrator" ."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -350,42 +358,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Instalacija zavrsena!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Nije moguce pokrenuti uredjaj."
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -393,39 +401,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Preuzimanje zavrseno!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Preuzmianje neuspelo!"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Mozete probati opet da nastavite vase preuzimanje."
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Ne mozete koriti izabran fajl. Mozda cete imati vise srece ako premestite vas ISO u glavni direktorijum vaseg uredjaja (npr. c:\)."
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s odabran."
@@ -496,86 +513,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sr@latin/sr@latin.po b/sr@latin/sr@latin.po
index efdc5edec..f7534c65f 100644
--- a/sr@latin/sr@latin.po
+++ b/sr@latin/sr@latin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/otf/torproject/language/sr@latin/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Ne mogu da pronađem uređaj %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Nepodržan sistem datoteka: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Proveravam sistem datoteka..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Pobrinite se da je USB ubačen i formatiran sa FAT sistemom datoteka"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Nepodržan sistem datoteka: %s\nNapravite rezervnu kopiju i potom formatirajte USB uređaj sa FAT sistemom datoteka."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Ne mogu da nađem"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Preuzimanje završeno!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Preuzimanje je neuspešno:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Možete pokušati opet da nastavite vaše preuzimanje"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/st/st.po b/st/st.po
index a9f24cae1..ba973f664 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Sotho, Southern (http://www.transifex.com/otf/torproject/language/st/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/su/su.po b/su/su.po
index b0469f8da..cf7b94355 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Sundanese (http://www.transifex.com/otf/torproject/language/su/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/sv/sv.po b/sv/sv.po
index ef0c6abbc..33f77f8b9 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -110,179 +110,179 @@ msgstr "Kunde inte ta bort mapp från tidigare LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Hittar inte enheten %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Kunde inte skriva till %(device)s, hoppar över"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Några partitioner på målenheten %(device)s är monterade. De kommer att avmonteras innan installationen påbörjas."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Okänt filsystem.  Din enhet kan behöva omformateras."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Stöder inte filsystemet: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Okänt GLib-undantag vid försök att montera enhet: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Kunde inte montera enheten: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Hittade inga monteringspunkter"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Anger unmount_device för "%(device)s""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Avmonterar monterade filsystem på "%(device)s""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Avmonterar "%(udi)s" på "%(device)s""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Montering %s existerar efter avmontering"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitionerar enheten %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Uppdaterar egenskaper för systempartitionen %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Enheten '%(device)s' stöds inte, anmäl detta som en bugg."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Försöker fortsätta ändå."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verifierar filsystem…"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Kunde inte byta etikett på volymen: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installerar starthanteraren..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Det gick inte att hitta modulen "%s" COM32"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Tar bort %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s är redan startbar"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Kunde inte hitta partitionen"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formaterar %(device)s som FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Det gick inte att hitta syslinux gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Läser extraherad MBR från %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Det gick inte att läsa extraheraded MBR från %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Nollställer Master Boot Record på %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Enheten är en loopback, hoppar över att återställa MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Beräknar SHA1 för %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synkroniserar data på disk..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Fel vid sökning efter enheten"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Hittade ingen enhet som stöds."
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Se till att din USB-pinne är inkopplat och formaterad med filsystemet FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Ej stött filsystem: %s\nGör en säkerhetskopia och formatera din USB-pinne med filsystemet FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Kunde inte läsa Win32_LogicalDisk; win32com frågan gav inte något svar"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Kan inte hitta"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -313,40 +313,48 @@ msgstr "Installationen är slutförd! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails installation misslyckades!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Varning: Detta verktyg måste köras som en administratör. För att göra detta, högerklicka på ikonen och välj Egenskaper. Under kompatibilitets-fliken markerar du rutan "Kör detta program som administratör"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails Installer"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Uppgradera"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Installera"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Ingen enhet som är lämplig för att installera Tails kunde hittas"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Anslut en USB-flash-enhet eller SD-kort med minst %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -354,42 +362,42 @@ msgid ""
 "different model."
 msgstr "USB-minnet "%(pretty_name)s" är konfigurerad som icke-flyttbar av dess tillverkare och Tails kommer misslyckas starta från det. Vänligen försök installera på ett annat märke."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Enheten "%(pretty_name)s" är för liten för att installera Tails (minst %(size)s GB krävs)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Ett fel inträffade under installationen av Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Uppdaterar utgåvor..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Utgåvor uppdaterade!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installationen slutförd!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Installation slutfördes."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Kunde inte montera enheten"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -397,39 +405,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Hämtning färdig!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Hämtning misslyckades: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Du kan försöka igen för att återuppta din hämtning"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Den valda filen kan inte läsas. Var god rätta till rättigheterna eller välj en annan fil."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Kunde inte använda den valda filen.  Det kanske fungerar bättre om du flyttar din ISO till roten av din enhet (t.ex: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s valda"
@@ -500,86 +517,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installera Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "För att köra Tails-installationen behöver du en ISO-fil som kan hämtas från Tails webbplats: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Installera"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installerar Tails på ett nytt USB-minne."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• USB-minnet som du installerar på kommer formateras och all data försvinna."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Uppgradera"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Uppgradera ett Tails-USB-minne till versionen som finns i en ISO-fil."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Den krypterade beständiga lagringen på Tails-USB-minnet som du uppgraderar kommer att behållas."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Behöver du hjälp? Läs <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edokumentationen</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Installera genom kloning"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Installerar Tails på ett annat USB-minne genom att kopiera Tails-systemet som du använder just nu."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Den krypterade beständiga lagringen på Tails-USB-minnet du använder nu kommer inte kopieras."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Uppgradera genom kloning"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Uppgradera ett annat Tails-USB-minne till samma version av Tails som du använder just nu."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Uppgradera från ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Uppgradera ett annat Tails-USB-minne till versionen som finns i en ISO-fil."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Behöver du hjälp? Läs <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">dokumentationen</a>"
diff --git a/sw/sw.po b/sw/sw.po
index 43cc63a08..ebf696fb6 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/szl/szl.po b/szl/szl.po
index 942043b6b..d7bff6b37 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Silesian (http://www.transifex.com/otf/torproject/language/szl/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ta/ta.po b/ta/ta.po
index 27747a031..f94a4dca5 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 18:52+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "%s கருவியை கண்டுபிடிக்க முடியவில்லை"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "எப்படியும் முயற்சி தொடர்கிறது."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "ஏற்கனவே துவங்கக்கூடிய %s"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "இதுவொரு loopback கருவி, MBR மீட்டமைத்தல் செய்யபடாது "
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "கண்டுபிடிக்க முடியவில்லை"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "நிறுவுதல் முடிந்தது! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "நிறுவுதல் முடிந்தது!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "பதிவிறக்கம் முடிந்தது!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "பதிவிறக்கம் தோல்வியடைந்தது: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s தேர்வுசெய்யபட்டது"
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails-ஐ நிறுவு"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/te/te.po b/te/te.po
index 08f9ba800..1d94ea436 100644
--- a/te/te.po
+++ b/te/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr "సంస్థాపన పూర్తి! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "హెచ్చరిక: ఈ టూల్ అడ్మినిస్ట్రేటర్గా రన్ చెయ్యాలి. ఇది చేయుటకు, ఐకాన్ పైన క్లిక్ చేసి ప్రాపర్టీస్ తెరవండి."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/te_IN/te_IN.po b/te_IN/te_IN.po
index d5fb07fdc..d1fd0b69d 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/templates/liveusb-creator.pot b/templates/liveusb-creator.pot
index 24604e4da..61287cdc9 100644
--- a/templates/liveusb-creator.pot
+++ b/templates/liveusb-creator.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr "Unable to remove directory from previous LiveOS: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Cannot find device %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Unable to write on %(device)s, skipping."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Some partitions of the target device %(device)s are mounted. They will be unmounted before starting the installation process."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Unknown filesystem.  Your device may need to be reformatted."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Unsupported filesystem: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Unknown GLib exception while trying to mount device: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Unable to mount device: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "No mount points found"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Entering unmount_device for '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Unmounting mounted filesystems on '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Unmounting '%(udi)s' on '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Mount %s exists after unmounting"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Partitioning device %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Updating properties of system partition %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Unsupported device '%(device)s', please report a bug."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Trying to continue anyway."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Verifying filesystem..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Unable to change volume label: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Installing bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Could not find the '%s' COM32 module"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Removing %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s already bootable"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Unable to find partition"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Formatting %(device)s as FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Could not find syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Reading extracted MBR from %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Could not read the extracted MBR from %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Resetting Master Boot Record of %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Drive is a loopback, skipping MBR reset"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Calculating the SHA1 of %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Synchronizing data on disk..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Error probing device"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Unable to find any supported device"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Make sure your USB key is plugged in and formatted with the FAT filesystem"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Unsupported filesystem: %s\nPlease backup and format your USB key with the FAT filesystem."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Unable to get Win32_LogicalDisk; win32com query did not return any results"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Cannot find"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr "Installation complete! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails installation failed!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Warning: This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the "Run this program as an administrator" box."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails Installer"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Upgrade"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Install"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "No ISO image selected"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Please select a Tails ISO image."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "No device suitable to install Tails could be found"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Please plug a USB flash drive or SD card of at least %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr "The USB stick "%(pretty_name)s" is configured as non-removable by its manufacturer and Tails will fail to start on it. Please try installing on a different model."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "The device "%(pretty_name)s" is too small to install Tails (at least %(size)s GB is required)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "An error happened while installing Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Refreshing releases..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Releases updated!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installation complete!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Installation was completed."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Unable to mount device"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Confirm the target USB stick"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)\n\nAll data on this USB stick will be lost."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s device (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr "\n\nThe persistent storage on this USB stick will be preserved."
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr "%(description)s%(persistence_message)s"
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Download complete!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Download failed: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "You can try again to resume your download"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "The selected file is unreadable. Please fix its permissions or select another file."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Unable to use the selected file.  You may have better luck if you move your ISO to the root of your drive (ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s selected"
@@ -490,86 +507,3 @@ msgstr "Target USB stick:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Reinstall (delete all data)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Install Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "To run Tails Installer you need an ISO image which can be downloaded from the Tails website: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Install"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Install Tails on a new USB stick."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• The USB stick that you install on is formatted and all data is lost."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Upgrade"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Upgrade a Tails USB stick to the version of an ISO image."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• The encrypted persistent storage of the Tails USB stick that you upgrade is preserved."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Need help? Read the <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Install by cloning"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Install Tails on another USB stick by copying the Tails system that you are currently using."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• The encrypted persistent storage of the Tails USB stick that you are currently using is not copied."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Upgrade by cloning"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Upgrade another Tails USB stick to the same version of Tails that you are currently using."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Upgrade from ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Upgrade another Tails USB stick to the version of an ISO image."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Need help? Read the <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
diff --git a/tg/tg.po b/tg/tg.po
index ea713913c..8edc3547b 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Tajik (http://www.transifex.com/otf/torproject/language/tg/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/th/th.po b/th/th.po
index 2c7185526..7f2a16719 100644
--- a/th/th.po
+++ b/th/th.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -107,179 +107,179 @@ msgstr "ไม่สามารถถอดออกไดเรกทอรี
 msgid "Cannot find device %s"
 msgstr "ไม่สามารถหาอุปกรณ์ %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "ไม่สามารถเขียนบน %(device)s, ข้ามไป"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Partition บน %(device)s ถูกเมานท์อยู่ จะยกเลิกการเม้านท์ก่อนเริ่มกระบวนการติดตั้ง"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "ไม่ทราบระบบแฟ้ม อุปกรณ์ของคุณอาจจะจำเป็นต้องถูกจัดระบบใหม่"
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "ระบบไฟล์ไม่สนับสนุน: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "ไม่สามารถใส่อุปกรณ์ %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "ไม่พบจุดเมาต์"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "กำลังเข้าสู่ unmount_device สำหรับ '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "ถอดระบบแฟ้มที่เชื่อมต่ออยู่ที่ '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "เลิกการเชื่อมต่อ %(udi)s' ที่ '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "ใส่ %s ที่มีอยู่หลังถอดออก"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "แบ่งที่อุปกรณ์ %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "ปรับปรุงค่าของ system partition %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "อุปกรณ์ไม่รองรับ '%(device)s' กรุณารายงานบั้ก"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "ลองทำต่อไปไม่ว่าอย่างไรก็ตาม"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "กำลังตรวจสอบระบบไฟล์..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "ไม่สามารถเปลี่ยนชื่อของแผ่น: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "กำลังติดตั้งบูตโหลดเดอร์..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "ถอดแฟ้มออก %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s บูตได้อยู่แล้ว"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "ไม่พบพาร์ติชัน"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "ฟอร์แมต %(device)s เป็น FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "เริ่ม Master Boot Record ใหม่ %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "ไดรฟ์ loopback, ข้ามไปเริ่มใหม่ MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "กำลังคำนวณ the SHA1 of %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "กำลังประสานข้อมูลบนดิสก์"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "ตรวจสอบข้อผิดพลาดของอุปกรณ์"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "ไม่พบอุปกรณ์ที่รองรับ"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "โปรดตรวจสอบให้แน่ใจว่าได้เสียบ USB key แล้วและถูกฟอร์แมตด้วยระบบไฟล์ FAT"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "ระบบไฟล์ไม่สนับสนุน: %s\nโปรดสำรองข้อมูลและฟอร์แมต USB key ด้วยระบบไฟล์แบบ FAT"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "ไม่สามารถรับ Win32_LogicalDisk; win32com คำถามไม่ได้ผลลัพธ์ไดๆ"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "ไม่สามารถค้นหา"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -310,40 +310,48 @@ msgstr "การติดตั้งเสร็จสิ้น! (%s)"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "คำเตือน: เครื่องมือนี้จำเป็นที่จะทำงานโดยผู้ดูแลระบบ ปฏิบัติโดยคลิกขวาที่ไอคอนและเปิดคุณสมบัติ อยู่ในแถบความเข้ากันได้, เลือกกล่อง "ตรวจสอบการทำงานของโปรแกรมของผู้ดูแลระบบ" "
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -351,42 +359,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "กำลังรีเฟรชรุ่นต่างๆ..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "ปรับปรุงรุ่นต่างๆแล้ว!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "การติดตั้งเสร็จสิ้น!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "ไม่สามารถเมานต์อุปกรณ์"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -394,39 +402,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "ดาวน์โหลดเสร็จสิ้น!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "ดาวน์โหลดล้มเหลว:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "คุณสามารถลองอีกครั้งได้เพื่อดาวน์โหลดต่อ"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "แฟ้มที่ถูกเลือกไม่สามารถอ่านได้ กรุณาแก้ไขสิทธิอนุญาตหรือเลือกแฟ้มอื่น"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "ไม่สามารถใช้แฟ้มที่เลือก อาจจะโชคดีกว่าถ้าย้าย ISO ไปไว้ที่รูตของไดรฟ์คุณ (ie: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ถูกเลือก"
@@ -497,86 +514,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "ลง Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ti/ti.po b/ti/ti.po
index dc2e9d469..6f794401b 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/tk/tk.po b/tk/tk.po
index 5eaf98167..3ceefd960 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Turkmen (http://www.transifex.com/otf/torproject/language/tk/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/tr/tr.po b/tr/tr.po
index 1de2e370c..3199bab27 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-16 04:41+0000\n"
-"Last-Translator: Kaya Zeren kayazeren@gmail.com\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
+"Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)%5Cn"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -114,179 +114,179 @@ msgstr "Önceki Canlı İşletim Sisteminden klasör silinemedi: %(message)s"
 msgid "Cannot find device %s"
 msgstr "%s aygıtı bulunamadı"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "%(device)s  aygıtına yazılamadı, atlanıyor."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "%(device)s hedef aygıtının bazı bölümleri takılmış. Yükleme işlemi başlatılmadan önce bu bölümler çıkarılacak."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Dosya sistemi bilinmiyor. Aygıtınızın yeniden biçimlendirilmesi gerekebilir."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Dosya sistemi desteklenmiyor: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Aygıt takılmaya çalışılırken bilinmeyen bir Glib sorunu çıktı: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Aygıt takılamadı: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Bir takılma noktası bulunamadı"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "'%(device)s' için unmount_device giriliyor"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr " '%(device)s' üzerindeki takılı dosya sistemleri çıkarılıyor"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "'%(udi)s' '%(device)s' aygıtı üzerinden çıkarılıyor"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Çıkarma işleminden sonra %s takılı"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "%(device)s aygıtı bölümlendiriliyor "
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "%(system_partition)s sistem bölümünün özellikleri güncelleniyor"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Desteklenemeyen '%(device)s' aygıtı, lütfen bu hatayı bildirin."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Yine de sürdürülmeye çalışılıyor."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Dosya sistemi doğrulanıyor..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Birim etiketi değiştirişemedi: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Bootloader yükleniyor..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "'%s' COM32 modülü bulunamadı"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr " %(file)s siliniyor"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s zaten başlatılabilir"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Bölüm bulunamadı"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "%(device)s FAT32 olarak biçimlendiriliyor"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "syslinux' gptmbr.bin bulunamadı"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "%s üzerinden ayıklanan MBR okunuyor"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "%(path)s üzerinden ayıklanan MBR okunamadı"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "%s üzerindeki ana ön yükleme kaydı (MBR) sıfırlanıyor"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Sürücü kapalı bir çevrim. Ana ön yükleme kaydı (MBR) sıfırlaması atlanıyor"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "%s için SHA1 hesaplanıyor"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Diskteki veriler eşitleniyor..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Aygıt araştırılırken bir sorun çıktı"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Herhangi bir desteklenen aygıt bulunamadı"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "USB belleğinizin takılı ve FAT dosya sistemi ile biçimlendirildiğinden emin olun"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Dosya sistemi desteklenmiyor: %s\nLütfen USB belleğinizi yedekleyip FAT dosya sistemi ile biçimlendirin."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Win32_LogicalDisk değeri alınamadı; win32com sorgusu bir sonuç döndürmedi"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Bulunamadı"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -317,40 +317,48 @@ msgstr "Yükleme tamamlandı! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails yüklemesi tamamlanamadı!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Uyarı: Bu araç Yönetici olarak çalıştırılmalıdır. Bunu yapmak için, araç simgesine sağ tıklayıp Özellikler sayfasını açın ve Uyumluluk sekmesinde "Bu programı Yönetici olarak aç" seçeneğini tıklayın."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails Yükleyici"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Yükselt"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Yükle"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s %(vendor)s %(model)s aygıt (%(device)s)"
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr "Herhangi bir ISO kalıbı seçilmemiş"
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr "Lütfen bir Tails ISO kalıbı seçin."
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Tails yükleyicisine uygun bir aygıt bulunamadı"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Lütfen en az %0.1f GB kapasiteli bir USB bellek ya da SD kart takın."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -358,42 +366,42 @@ msgid ""
 "different model."
 msgstr "USB belleği "%(pretty_name)s" üreticisi tarafından çıkarılamaz olarak yapılandırılmış olduğundan Tails buradan başlatılamayacak. Lütfen farklı bir modele yüklemeyi deneyin."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""%(pretty_name)s" aygıtı Tails yazılımının yüklenmesi için çok küçük (en az %(size)s GB gereklidir)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Tails kurulurken bir sorun çıktı"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Sürümler yenileniyor..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Sürümler güncellendi!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Yükleme tamamlandı!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Yükleme tamamlandı."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Aygıt takılamadı"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr "Hedef USB belleği onaylayın"
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -401,39 +409,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr "%(size)s %(vendor)s %(model)s aygıt (%(device)s)\n\nBu USB bellek üzerindeki tüm veriler kaybolacak."
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
-msgstr "%(vendor)s %(model)s aygıt (%(device)s)\n\n%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "İndirme tamamlandı!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "İndirilemedi:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "İndirmeyi sürdürmeyi deneyebilirsiniz"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Seçilen dosya okunamıyor. Lütfen dosya izinlerini denetleyin ya da başka bir dosya seçin."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Seçilmiş dosya kullanılamadı. ISO kalıbını diskinizin kök klasörüne taşımanız işe yarayabilir (C:\ gibi)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s seçildi"
@@ -504,86 +521,3 @@ msgstr "Hedef USB bellek:"
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr "Yeniden Yükle (tüm verileri sil)"
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails Yazılımını Yükle"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Tails yükleyiciyi çalıştırmak için Tails web sitesinden indirilebilecek bir ISO kalıbı gereklidir: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Yükle"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Tails uygulamasını yeni bir USB bellek üzerine yükleyin."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• Üzerine yükleme yapılacak USB bellek biçimlendirilecek ve tüm veriler kaybolacak."
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Yükselt"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Tails USB belleğini, ISO kalıbındaki sürüme yükseltin."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Yükseltme yaptığınız Tails USB belleğindeki şifreli kalıcı depolama korunacak."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Yardım mı gerekli? <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3EBelgeleri</a> okuyun"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Kopyalayarak yükle"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Kullandığınız Tails sisteminin kopyasını başka bir USB belleğe yükleyin."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Şu anda kullandığınız Tail USB belleğinin şifrelenmiş kalıcı depolaması kopyalanmaz."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Kopyalayarak yükselt"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Başka bir Tails USB belleğini şu an kullandığınız Tails sürümüne yükseltin."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "ISO kalıbından yükselt"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Başka bir Tails USB belleğini bir ISO kalıbı sürümüne yükseltin."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Yardım mı gerekli? <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">Belgeleri</a> okuyun"
diff --git a/tzm/tzm.po b/tzm/tzm.po
index d346b3c03..25bdc2482 100644
--- a/tzm/tzm.po
+++ b/tzm/tzm.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ug@Arab/ug@Arab.po b/ug@Arab/ug@Arab.po
index 3e2ee7958..7a6b70966 100644
--- a/ug@Arab/ug@Arab.po
+++ b/ug@Arab/ug@Arab.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-20 12:11+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -101,179 +101,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "التحقق من نظام الملفات"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "جاري إزالة %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -304,40 +304,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -345,42 +353,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "!الاصدارات محدثه"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -388,39 +396,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "يمكنك محاولة استئناف التحميل مرة اخرى"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -491,86 +508,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/uk/uk.po b/uk/uk.po
index 2f0ee3154..0167be2a6 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -107,179 +107,179 @@ msgstr "Не вдалося видалити директорію з попер
 msgid "Cannot find device %s"
 msgstr "Пристрій %s не знайдено"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Неможливо записати на %(device)s, пропускаю."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Деякі розділи цільового пристрою %(device)s змонтовані. Вони будуть демонтовані перед початком установки."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Невідома файлова система. Ваш пристрій потребує переформатування."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Непідтримувана файлова система: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Невідоме виключення GLib при спробі встановити пристрій: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Не вдалося змонтувати пристрій: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Немає точок монтування"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Відкриття незмонтованого пристрою для '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Демонтування файлових систем на '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Розмонтування '%(udi)s' на '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Точка монтування %s існує після демонтування"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Розмітка пристрою %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Оновити властивості системного розділу %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Непідтримуваний пристрій '%(device)s', будь ласка, повідомте про помилку."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Спроба все одно продовжити. "
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Перевірка файлової системи..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Не вдалося змінити мітку тому: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Установка завантажувача..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Could not find the '%s' COM32 module"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Видалення %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s вже завантажувальний"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Не вдалося знайти розділ"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Форматування %(device)s у FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Очищення головного завантажувального запису %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Цей диск є циклічним пристроєм, пропускаємо очищення MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Розрахунок SHA1 від %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Синхронізація даних на диску..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Помилка зондування пристрою"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Не вдалося знайти пристрій, що підтримується"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Перевірте, що USB-пристрій приєднаний та форматований (FAT)"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Непідтримувана файлова система: %s\nЗробіть резервну копію даних та відформатуйте USB-пристрій у файлову систему FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Неможливо отримати Win32_LogicalDisk; win32com нічого не повернув"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Не вдалося знайти"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -310,40 +310,48 @@ msgstr "Установка завершена! (%s)"
 msgid "Tails installation failed!"
 msgstr "Не вдалося инсталювати Tails"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Увага: Для роботи потрібні права Адміністратора. Що б отримати їх, натисніть правою кнопкою на піктограму програми і відкрийте Властивості. У вкладці Сумісність поставте галочку на "Виконувати цю програму від імені адміністратора"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Инсталятор Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -351,42 +359,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Пристрій "%(pretty_name)s" замалий для встановлення Tails (потрібно хочаб %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Оновлення списку релізів..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Список релізів оновлений"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Установка завершена!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Не вдалося змонтувати пристрій"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -394,39 +402,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Завантаження завершено!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Помилка при завантаженні: "
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Можете спробувати продовжити завантаження"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Вибраний файл не читається. Виправте файл або виберіть інший."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Неможливо використовувати вказаний файл. Спробуйте перемістити ISO в корінь диска (наприклад, C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s обрано"
@@ -497,86 +514,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Встановити Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Оновити з ISO файлу"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Потрібна допомога? Читати <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">документацію</a>"
diff --git a/ur/ur.po b/ur/ur.po
index 99598987f..aa201a8dd 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ur_PK/ur_PK.po b/ur_PK/ur_PK.po
index 16de192a7..8cd6168b7 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/otf/torproject/language/ur_PK/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -102,179 +102,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "تقسیم کو تلاش کرنے کے قابل نہیں۔"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -305,40 +305,48 @@ msgstr "نصب کرنے کا عمل پورا ہوا!%s"
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "نصب کریں"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -346,42 +354,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "نصب کرنے کا عمل پورا ہوا!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -389,39 +397,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -492,86 +509,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "نصب کریں"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/uz/uz.po b/uz/uz.po
index da473c230..3b1663abd 100644
--- a/uz/uz.po
+++ b/uz/uz.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/ve/ve.po b/ve/ve.po
index 69ae3d40e..e196e18cc 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Venda (http://www.transifex.com/otf/torproject/language/ve/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/vi/vi.po b/vi/vi.po
index 08d015547..10b369867 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 17:03+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -104,179 +104,179 @@ msgstr "Không thể gỡ bỏ thư mục từ LiveOS trước: %(message)s"
 msgid "Cannot find device %s"
 msgstr "Không thể tìm thấy thiết bị %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Không thể viết lên %(device)s, đang bỏ qua."
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "Một vài phân vùng của thiết bị %(device)s đã được gắn lên. Chũng sẽ bị gỡ ra trước khi bắt đầu quá trình cài đặt."
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Định dạng không xác định. Thiết bị của bạn có thể cần được định dạng lại."
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "Tập tin hệ thống không được hỗ trợ: %s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Ngoại lệ GLib chưa biết khi kết nối thiết bị: %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Không thể gắn thiết bị: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "Không có ổ đĩa được tìm thấy"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "Đang nhập thiết bị_chưa gắn cho '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Đang gỡ tập tin hệ thống đã được gắn trên '%(device)s'"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Đang gỡ '%(udi)s' trên '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "Việc gắn %s thoát ra sau khi gỡ bỏ"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Đang phân vùng thiết bị %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "Đang cập nhật thuộc tính của phân vùng hệ thống %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "Thiết bị không được hỗ trợ  '%(device)s', vui lòng báo lỗi."
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Cứ tiếp tục."
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "Đang xác minh tập tin hệ thống..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Không thể đổi tên ổ đĩa: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "Đang cài đặt chương trình khởi động..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "Đã không thể tìm thấy phần '%s' COM32"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "Đang loại bỏ %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s đã có thể khởi động"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "Không thể tìm thấy phân vùng"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "Đang định dạng %(device)s ở dạng FAT32"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "Đã không thể tìm thấy syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Đọc MBR được giải nén từ %s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "Đã không thể đọc MBR được giải nén từ %(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "Đang thiết lập lại Master Boot Record của %s"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "Ổ đĩa là loopback, bỏ qua việc thiết lập lại MBR"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "Đang tính toán SHA của %s"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "Đang đồng bộ hóa dữ liệu trên ổ đĩa..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "Thiết bị gặp lỗi thăm dò"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "Không thể tìm thấy bất kỳ thiết bị được hỗ trợ nào"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "Cần đảm bảo USB của bạn được cắm vào và được format với định dạng FAT."
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "Tập tin hệ thống không được hỗ trợ: %s\nVui lòng sao lưu và định dạng lại USB của bạn với file hệ thống định dạng FAT."
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "Không thể lấy Win32_LogicalDisk; truy vấn win32com không trả bất kỳ kết quả nào"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "Không thể tìm thấy"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -307,40 +307,48 @@ msgstr "Cài đặt hoàn tất! (%s)"
 msgid "Tails installation failed!"
 msgstr "Việc cài đặt Tails đã thất bại!"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "Cảnh báo: Công cụ này cần phải chạy với quyền quản trị. Để làm được điều này, bấm chuột phải vào biểu tượng và mở Thuộc tính. Ở thẻ Tương thích, chọn hộp "Chạy chương trình với quyền quản trị"."
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Trình cài đặt Tails"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Nâng cấp"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Cài đặt"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Đã không thể tìm thấy thiết bị nào phù hợp cho việc cài đặt Tails"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "Hãy cắm một ổ USB di động hay thẻ SD với dung lượng ít nhất %0.1f GB."
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -348,42 +356,42 @@ msgid ""
 "different model."
 msgstr "Thẻ USB %(pretty_name)s được cấu hình không thể di rời bởi nhà sản xuất và Tails sẽ không khởi động được. Hãy thử cài đặt lên một mẫu USB khác."
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "Thiết bị "%(pretty_name)s" quá nhỏ để cài đặt Tails (yêu cầu ít nhất %(size)s GB)."
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "Một lỗi đã xuất hiện trong khi cài đặt Tails"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Đang làm mới phiên bản"
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Phiên bản đã được làm mới!"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Cài đặt hoàn tất!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "Việc cài đặt đã được hoàn tất."
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Không thể gắn thiết bị"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -391,39 +399,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Tải xuống hoàn tất!"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Tải xuống thất bại:"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Bạn có thể thử lại để tiếp tục việc tải xuống"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "Những tập tin được chọn không thể đọc được. Vui lòng sửa quyền của nó hoặc chọn một tập tin khác."
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "Không thể sử dụng tập tin được chọn. Bạn có thể may mắn hơn nếu bạn di duyển ISO của bạn tới nền của thiết bị của bạn (ví dụ: C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s được chọn"
@@ -494,86 +511,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Cài đặt Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "Để chạy trình cài đặt Tails bạn cần một ảnh ISO được tải về từ trang web Tails: <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Cài đặt"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Cài đặt Tails lên một thẻ USB mới."
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "• Thẻ USB bạn cài đặt bị định dạng (format) và tất cả giữ liệu bị mất"
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Nâng cấp"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Nâng cấp một thẻ USB Tails lên phiên bản của một ảnh ISO."
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "• Phân vùng lưu trữ bền vững được mã hoá của thẻ USB Tails bạn nâng cấp được lưu giữ."
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "Cần trợ giúp? Xem <a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Et%C3%A0i liệu này</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Cài đặt bằng cách nhân bản."
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "• Cài đặt Tails lên một thẻ USB khác bằng cách sao chép hệ thống Tails mà bạn hiện đang sử dụng."
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "• Phân vùng lưu trữ bền vững được mã hoá của thẻ USB Tails bạn hiện đang dùng không được sao chép."
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Nâng cấp bằng cách nhân bản"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "• Nâng cấp một thẻ USB Tails khác lên cùng phiên bản của Tails mà bạn hiện đang sử dụng."
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Nâng cấp từ [ảnh] ISO"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• Nâng cấp một thẻ USB Tails khác lên phiên bản của một ảnh ISO."
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "Cần trợ giúp? Xem <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">tài liệu này</a>"
diff --git a/wa/wa.po b/wa/wa.po
index 150f890a1..d383d4c64 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Walloon (http://www.transifex.com/otf/torproject/language/wa/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/wo/wo.po b/wo/wo.po
index 365f32749..70342f010 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Wolof (http://www.transifex.com/otf/torproject/language/wo/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 526157b9f..780d37ba6 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -116,179 +116,179 @@ msgstr "无法从之前的 LiveOS 中删除目录：%(message)s"
 msgid "Cannot find device %s"
 msgstr "无法找到设备 %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "无法向 %(device)s 中写入，正在跳过。"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "目标设备的一些分区 %(device)s 已经加载，并将在安装过程开始之前卸载。"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "未知的文件系统。  您的设备也许需要重新格式化。"
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "不支持的文件系统：%s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "尝试安装下列设备时遇到未知的 GLib 异常：%(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "无法挂载设备：%(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "未找到挂载点"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "输入 '%(device)s' 的卸载设备"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "卸载 '%(device)s' 上的已挂载文件系统"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "卸载 '%(device)s' 上的 '%(udi)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "卸载之后掛载已存在 %s "
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "分区设备 %(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "更新系统分区属性 %(system_partition)s"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "不是支持的设备'%(device)s',请报告此故障。"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "无论如何正在尝试继续"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "正在验证文件系统..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "无法改变卷标: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "正在安装引导程序..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "无法找到“%s” COM32 模块"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "正在移除 %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s 已经是可引导盘"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "找不到分区"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "正在格式化 %(device)s 为 FAT32 格式"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "无法找到 syslinux 的 gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "读取从 %s 提取的 MBR"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "无法读取从 %(path)s 提取的 MBR"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "正在重置 %s 的 MBR"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "驱动器为环回 ，跳过 MBR 重设"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "正在计算 %s 的 SHA1 校验值"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "正在同步硬盘中的数据..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "检测设备时出错"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "无法找到任何支持的设备。"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "请确认你的U盘已插入并已用 FAT 文件系统格式化"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "不支持的文件系统：%s\n请备份并用 FAT 文件系统格式化你的U盘"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "无法调用 Win32_LogicalDisk 函数；win32com 查询未返回任何结果"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "找不到"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -319,40 +319,48 @@ msgstr "安装完成! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails 安装失败！"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "警告: 本工具需要以管理员权限运行。请右键单击本工具的快捷方式图标，在文件属性的兼容性选项卡中的选中"以管理员身份运行此程序"。"
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails 安装程序"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "升级"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "安装"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "找不到适合安装 Tails 的设备"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "请插入容量大小至少为 %0.1f GB 的 U 盘或 SD 卡。"
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -360,42 +368,42 @@ msgid ""
 "different model."
 msgstr "此USB移动存储设备"%(pretty_name)s"被生产厂商配置为非可移动磁盘，Tail无法在其上启动。请尝试在其他移动存储设备上安装。"
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "设备“%(pretty_name)s”太小，不足以安装 Tails（需要至少 %(size)s GB 的空间）。"
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "安装 Tails 时发生错误"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "刷新发布..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "发布已更新！"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "安装完成!"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "安装完成。"
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "无法挂载设备"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -403,39 +411,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "下载完成！"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "下载失败！"
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "你可以重试续传你的下载"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "选中文件不可读。请修改其许可或选择其他文件。"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "无法使用所选文件。您可以将文件移动到磁盘根目录后再试(例如 C:\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s 已选取"
@@ -506,86 +523,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "安装Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "运行 Tails 安装程序之前您需要从 Tails 网站 <a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a> 下载 ISO 镜像。"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "安装"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "在新 U 盘上安装 Tails。"
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "您用于安装的 U 盘已被格式化，清除了所有数据。"
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "升级"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "升级 Tails U盘 到 ISO 镜像的版本。"
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "你升级的USB移动存储上Tails系统的加密永久存储被被保留了。"
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "需要帮助？查看<a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3E%E6%96%87%E6%A1...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "通过克隆安装"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "通过复制你正在使用的Tails系统，安装Tails到另一个USB移动存储设备。"
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "你正在使用的USB移动存储上的Tails的加密永久存储不会被复制。"
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "通过克隆升级"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "升级其他 Tails U盘 到您正在使用的 Tails 版本"
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "从 ISO 升级"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "• 升级另一个 Tails U盘 到一个 ISO 镜像的版本。"
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "需要帮助？查看<a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">文档</a>"
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 4315c1e8b..6faace25a 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -110,179 +110,179 @@ msgstr "無法由先前嘅LiveOS移除目錄：%(message)s"
 msgid "Cannot find device %s"
 msgstr "搵唔到裝置%s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "無法寫入%(device)s，略過。"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "目標裝置%(device)s中一啲分割區已掛接。佢哋將於開始安裝過程前被卸載。"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "未知嘅檔案系統。你嘅裝置可能須重新格式化。"
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "唔支援嘅檔案系統：%s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "嘗試安裝設備時出現未知的GLib異常： %(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "無法掛接裝置：%(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "搵唔到掛接點"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "進入未掛接裝置「%(device)s」"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "正在卸載掛接係%(device)s上嘅檔案系統"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "正在卸載%(device)s嘅%(udi)s"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "取消掛接後%s掛接仍存在"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "分割區裝置%(device)s"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "升級系統分割區%(system_partition)s嘅屬性"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "唔支援嘅裝置%(device)s，請報告錯誤。"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "無論如何仍嘗試繼續。"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "正在驗證檔案系統…"
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "無法更改磁碟區標籤：%(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "安裝Bootloader…"
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "找不到'%s'COM32模塊"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "移除%(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s已可開機"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "搵唔到分割區"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "將%(device)s格式化成Fat32格式"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "找不到syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "從MBR中讀取%s"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "無法讀取所選取的MBR%(path)s"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "重設%s的MBR主開機紀錄"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "磁碟迴送，略過MBR重設"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "計算%s嘅SHA1"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "同步磁碟上嘅資料…"
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "探測裝置失敗"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "搵唔到任何支援嘅裝置"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "請確認USB磁碟已插入，並使用FAT進行格式化"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "唔支援嘅檔案系統：%s\n請進行備份並使用FAT嚟格式化USB磁碟。"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "無法取得Win32_LogicalDisk；win32com查詢未傳回任何結果"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "搵唔到"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -313,40 +313,48 @@ msgstr "安裝完成！(%s)"
 msgid "Tails installation failed!"
 msgstr "Tails安裝失敗！"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "警告：此工具需以系統管理員身份執行。請對圖示撳滑鼠右鍵後點選內容，喺相容性分頁下，選取「以系統管理員身份執行此程式」。"
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails安裝程序"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "請插入至少%0.1fGB的USB快閃隨身碟或SD卡。"
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -354,42 +362,42 @@ msgid ""
 "different model."
 msgstr "USB快閃隨身碟"%(pretty_name)s"由其製造商設計為不可拆卸，並且Tails將無法啟動它。請嘗試安裝在其他型號上。"
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "「%(pretty_name)s」設備嘅容量太小，無法安裝Tails(至少需要%(size)s GB嘅空間)。"
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "安裝Tails時發生錯誤"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "正在重新整理版本…"
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "版本已更新！"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "安裝完成！"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "安裝完成"
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "無法掛接裝置"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -397,39 +405,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "下載完成！"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "下載失敗："
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "可嘗試回復下載"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "所選檔案無法讀取。請修正其權限或選取另一檔案。"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "無法使用所選檔案。如你將ISO移動到磁碟根目錄下(例如：C:\)，你可能會好運一啲"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "已選取%(filename)s"
@@ -500,86 +517,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "安裝Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""
diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 01bbba542..6be64d069 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-19 14:12+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -114,179 +114,179 @@ msgstr "無法從先前的 LiveOS 移除目錄: %(message)s"
 msgid "Cannot find device %s"
 msgstr "找不到裝置 %s"
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "無法寫入 %(device)s，略過。"
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "目標裝置 %(device)s 中有些分割區已經被掛載。它們將在開始安裝前被自動卸載。"
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "未知的檔案系統。您的裝置可能需要重新格式化。"
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "不支援的檔案系統：%s"
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "試圖掛載底下裝置時，發生了未知的 GLib 例外事件：%(message)s"
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "無法掛載裝置: %(message)s"
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr "找不到掛載點"
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "進入未掛載裝置 '%(device)s'"
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "正在卸載已掛載於 '%(device)s' 上的檔案系統"
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "正在卸載 '%(udi)s' 在 '%(device)s'"
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "取消掛載後 %s 掛載仍存在"
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "正在為 %(device)s 建立分割區"
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr "正在更新系統分割區 %(system_partition)s 的屬性"
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr "不支援的裝置 '%(device)s'，請回報此錯誤。"
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "無論如何仍嘗試繼續。"
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr "正在驗證檔案系統..."
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "無法變更磁碟區標籤: %(message)s"
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr "正在安裝 bootloader..."
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr "找不到「%s」COM32模組"
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr "正在移除 %(file)s"
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr "%s 已經可開機"
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr "找不到分割區"
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr "正將 %(device)s 格式化成 FAT32 格式"
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr "找不到syslinux' gptmbr.bin"
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "正在從%s中讀取MBR資訊"
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr "無法從%(path)s中讀取MBR資訊"
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr "重設 %s 的 MBR 主開機紀錄"
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr "磁碟回送，略過 MBR 重設"
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr "正在計算 %s 的 SHA1 雜湊碼"
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr "正在同步磁碟上的資料..."
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr "探測裝置失敗"
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr "找不到任何有支援的裝置"
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr "請確認您的 USB 磁碟已插入，並且已被格式化成 FAT 檔案系統"
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr "不支援的檔案系統：%s\n請將您的 USB 隨身碟內之資料進行備份，並將它格式化成 FAT 檔案系統。"
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr "無法取得 Win32_LogicalDisk；win32com 查詢沒有傳回任何結果"
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr "找不到"
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -317,40 +317,48 @@ msgstr "安裝完成! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails 系統安裝失敗！"
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr "警告：此工具需以系統管理員身分執行。請對圖示按滑鼠右鍵後點選內容，在相容性頁籤下，勾選「以系統管理員身份執行此程式」方塊。"
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr "Tails 安裝程式"
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "升級"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "安裝"
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "找不到可以安裝 Tails 系統的裝置"
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr "請插入最少有%0.1fGB空間的USB隨身碟或SD記憶卡。"
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -358,42 +366,42 @@ msgid ""
 "different model."
 msgstr "此USB隨身碟「%(pretty_name)s」已被原廠設定為不可移除模式，故安裝於其中的 Tails 系統將無法正常啟動。請試著更換別種型號的儲存裝置。"
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr "“%(pretty_name)s”設備的容量太小，無法安裝Tails (至少需要 %(size)s GB 的空間)。"
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr "安裝 Tails 系統時發生錯誤"
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "正在重新整理版本..."
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "版本已更新！"
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "安裝完成！"
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr "安裝已經完成。"
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "無法掛接裝置"
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -401,39 +409,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
+msgstr ""
+
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "下載完成！"
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "下載失敗："
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "您可再次嘗試來繼續您的下載"
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr "所選取的檔案無法讀取，請修改該檔案之存取權限或選擇另一個檔案。"
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr "無法使用所選取的檔案，或許您可以嘗試將 ISO 檔移動到磁碟根目錄下(例如：C：\)"
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s 已選取"
@@ -504,86 +521,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "安裝 Tails"
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr "若要執行 Tails 安裝程式，你必須要先從此網站下載一個 ISO 影像檔：<a href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "安裝"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "‧將 Tails 系統安裝在一個新的 USB 隨身碟中。"
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr "‧您所選擇要安裝的 USB 隨身碟已被格式化，裡面的資料已經全部消失。"
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "升級"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "‧將隨身碟中的 Tails 系統版本升級到與 ISO 影像檔相同。"
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "‧裝有 Tails 系統的加密式永久儲存裝置已經被保存。"
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr "需要幫助嗎？請閱讀<a href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3E%E8%AA%AA%E6%98...</a>"
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "複製式安裝"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr "‧藉由複製目前正在使用的 Tails 系統來將它安裝到另一個 USB 隨身碟中。"
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr "‧您正在使用的加密式永久儲存裝置裡的 Tails 隨身碟並未被複製。"
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "複製式升級"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr "‧將另一個隨身碟中的 Tails 系統升級至與目前您正使用版本相同。"
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "由 ISO 影像檔升級"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr "‧將另一個隨身碟中的 Tails 系統版本升級到與 ISO 影像檔相同。"
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr "需要幫助嗎？請閱讀<a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">說明文件</a>"
diff --git a/zu/zu.po b/zu/zu.po
index be7181485..24376acc4 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: 2017-09-14 14:52+0200\n"
-"PO-Revision-Date: 2017-09-14 13:47+0000\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
+"PO-Revision-Date: 2017-09-21 01:33+0000\n"
 "Last-Translator: carolyn carolyn@anhalt.org\n"
 "Language-Team: Zulu (http://www.transifex.com/otf/torproject/language/zu/)%5Cn"
 "MIME-Version: 1.0\n"
@@ -100,179 +100,179 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr ""
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr ""
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr ""
-#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986
+#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
-#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989
+#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr ""
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:791
+#: ../tails_installer/creator.py:797
 msgid "No mount points found"
 msgstr ""
-#: ../tails_installer/creator.py:802
+#: ../tails_installer/creator.py:808
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:812
+#: ../tails_installer/creator.py:818
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr ""
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:832
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr ""
-#: ../tails_installer/creator.py:839
+#: ../tails_installer/creator.py:845
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr ""
-#: ../tails_installer/creator.py:917
+#: ../tails_installer/creator.py:920
 #, python-format
 msgid "Updating properties of system partition %(system_partition)s"
 msgstr ""
-#: ../tails_installer/creator.py:971
+#: ../tails_installer/creator.py:976
 #, python-format
 msgid "Unsupported device '%(device)s', please report a bug."
 msgstr ""
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr ""
-#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376
+#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381
 msgid "Verifying filesystem..."
 msgstr ""
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr ""
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 msgid "Installing bootloader..."
 msgstr ""
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
-#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427
+#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
 msgid "Removing %(file)s"
 msgstr ""
-#: ../tails_installer/creator.py:1158
+#: ../tails_installer/creator.py:1163
 #, python-format
 msgid "%s already bootable"
 msgstr ""
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 msgid "Unable to find partition"
 msgstr ""
-#: ../tails_installer/creator.py:1201
+#: ../tails_installer/creator.py:1206
 #, python-format
 msgid "Formatting %(device)s as FAT32"
 msgstr ""
-#: ../tails_installer/creator.py:1261
+#: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
 msgstr ""
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
-#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292
+#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
 msgid "Resetting Master Boot Record of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1297
+#: ../tails_installer/creator.py:1302
 msgid "Drive is a loopback, skipping MBR reset"
 msgstr ""
-#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555
+#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560
 #, python-format
 msgid "Calculating the SHA1 of %s"
 msgstr ""
-#: ../tails_installer/creator.py:1326
+#: ../tails_installer/creator.py:1331
 msgid "Synchronizing data on disk..."
 msgstr ""
-#: ../tails_installer/creator.py:1368
+#: ../tails_installer/creator.py:1373
 msgid "Error probing device"
 msgstr ""
-#: ../tails_installer/creator.py:1370
+#: ../tails_installer/creator.py:1375
 msgid "Unable to find any supported device"
 msgstr ""
-#: ../tails_installer/creator.py:1380
+#: ../tails_installer/creator.py:1385
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
 msgstr ""
-#: ../tails_installer/creator.py:1383
+#: ../tails_installer/creator.py:1388
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
 msgstr ""
-#: ../tails_installer/creator.py:1450
+#: ../tails_installer/creator.py:1455
 msgid ""
 "Unable to get Win32_LogicalDisk; win32com query did not return any results"
 msgstr ""
-#: ../tails_installer/creator.py:1503
+#: ../tails_installer/creator.py:1508
 msgid "Cannot find"
 msgstr ""
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
@@ -303,40 +303,48 @@ msgstr ""
 msgid "Tails installation failed!"
 msgstr ""
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the "Run this program as an administrator" box."
 msgstr ""
-#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
+#: ../tails_installer/gui.py:375
 msgid "Tails Installer"
 msgstr ""
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr ""
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr ""
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick "%(pretty_name)s" is configured as non-removable by its "
@@ -344,42 +352,42 @@ msgid ""
 "different model."
 msgstr ""
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device "%(pretty_name)s" is too small to install Tails (at least "
 "%(size)s GB is required)."
 msgstr ""
-#: ../tails_installer/gui.py:592
+#: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
 msgstr ""
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr ""
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr ""
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr ""
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 msgid "Installation was completed."
 msgstr ""
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr ""
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -387,39 +395,48 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+
+#: ../tails_installer/gui.py:726
+#, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr ""
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr ""
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr ""
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr ""
-#: ../tails_installer/gui.py:795
+#: ../tails_installer/gui.py:789
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
 "another file."
 msgstr ""
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\)"
 msgstr ""
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr ""
@@ -490,86 +507,3 @@ msgstr ""
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
 msgstr ""
-
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:1
-msgid ""
-"To run Tails Installer you need an ISO image which can be downloaded from "
-"the Tails website: <a "
-"href="https://tails.boum.org/download/%5C%22%3Ehttps://tails.boum.org/download/</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:8
-msgid ""
-"Need help? Read the <a "
-"href="https://tails.boum.org/doc/first_steps/installation/%5C%22%3Edocumentation</a>"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a "
-"href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a>"
-msgstr ""

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator