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

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



commit ace9a74ad48b0eea6e61bae2f9666068d5ece633
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
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@xxxxxxxxxxx    | 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@xxxxxxxx          | 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@xxxxxxx            | 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@xxxxxxxxxx>\n"
 "Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Adyghe (http://www.transifex.com/otf/torproject/language/ady/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Akan (http://www.transifex.com/otf/torproject/language/ak/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Mapudungun (http://www.transifex.com/otf/torproject/language/arn/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Bashkir (http://www.transifex.com/otf/torproject/language/ba/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "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/\";>https://tails.boum.org/download/</a>"
-msgstr "Ð?а да Ñ?Ñ?аÑ?Ñ?иÑ?аÑ?е Tails инÑ?Ñ?алаÑ?оÑ?а Ñ?е нÑ?ждаеÑ?е оÑ? ISO Ñ?айл, койÑ?о може да бÑ?де иÑ?еглен оÑ? Ñ?ебÑ?айÑ?а на Tails: <a href=\"https://tails.boum.org/download/\";>https://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/\";>documentation</a>"
-msgstr "Ð?Ñ?ждаеÑ?е Ñ?е оÑ? помоÑ?? Ð?Ñ?оÑ?еÑ?еÑ?е <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>докÑ?менÑ?аÑ?иÑ?Ñ?а</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@xxxxxxxxxx>\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/otf/torproject/language/bn_IN/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Tibetan (http://www.transifex.com/otf/torproject/language/bo/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Bodo (http://www.transifex.com/otf/torproject/language/brx/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Cebuano (http://www.transifex.com/otf/torproject/language/ceb/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Kashubian (http://www.transifex.com/otf/torproject/language/csb/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Chuvash (http://www.transifex.com/otf/torproject/language/cv/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Brug for hjælp? Læs <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>dokumentationen</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@xxxxxxxxxxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Brauchen Sie Hilfe? Lesen Sie die <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>Dokumentation</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@xxxxxxxxxx>\n"
 "Language-Team: Dzongkha (http://www.transifex.com/otf/torproject/language/dz/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "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/\";>https://tails.boum.org/download/</a>"
-msgstr "Î?ια Ï?ην εκκίνηÏ?η Ï?οÏ? Ï?Ï?ογÏ?άμμαÏ?οÏ? εγκαÏ?άÏ?Ï?αÏ?ηÏ? Ï?οÏ? Tails Ï?Ï?ειάζεÏ?Ï?ε μία εικÏ?να ISO Ï?οÏ? μÏ?οÏ?εί να ληÏ?θεί αÏ?Ï? Ï?ον ιÏ?Ï?Ï?Ï?οÏ?ο Ï?οÏ? Tails: <a href=\"https://tails.boum.org/download/\";>https://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/\";>documentation</a>"
-msgstr "ΧÏ?ειάζεÏ?Ï?ε βοήθεια? Î?ιαβάÏ?Ï?ε Ï?α <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>αÏ?Ï?εία βοήθειαÏ?</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@xxxxxxxxxx>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxx>, 2013
 # dark_yoshi <angelargi@xxxxxxxx>, 2014
 # BL <tresemes3@xxxxxxxxx>, 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@xxxxxxxxxx>\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "¿Necesitas ayuda? Lee la <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>documentación</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@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "¿Necesitas ayuda? Lee la <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>documentación</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@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/otf/torproject/language/es_CL/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/otf/torproject/language/es_CO/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "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/\";>https://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/\";>documentation</a>"
-msgstr "بÙ? Ú©Ù?Ú© Ù?Û?از دارÛ?دØ? <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>Ù?ستÙ?دات</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@xxxxxxxxxx>\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Filipino (http://www.transifex.com/otf/torproject/language/fil/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Faroese (http://www.transifex.com/otf/torproject/language/fo/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Besoin d'aideâ??? Consulter la <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>documentation</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@xxxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Besoin d'aide? Consulter la <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Friulian (http://www.transifex.com/otf/torproject/language/fur/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Gujarati (India) (http://www.transifex.com/otf/torproject/language/gu_IN/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Gun (http://www.transifex.com/otf/torproject/language/gun/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Hausa (http://www.transifex.com/otf/torproject/language/ha/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Trebate pomoÄ?? ProÄ?itajte <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>dokumentaciju</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@xxxxxxxxxx>\n"
 "Language-Team: Haitian (Haitian Creole) (http://www.transifex.com/otf/torproject/language/ht/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Vantar þig hjálp? Lestu <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>hjálparskjölin</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@xxxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Serve aiuto? Leggi la <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>documentazione</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@xxxxxxxxxx>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Javanese (http://www.transifex.com/otf/torproject/language/jv/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "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/\";>https://tails.boum.org/download/</a>"
-msgstr "Tails Installer를 ì?¤í??í??려면 Tails ì?¹ ì?¬ì?´í?¸ì??ì?? ë?¤ì?´ë¡?ë?? í?  ì?? ì??ë?? ISO ì?´ë¯¸ì§?ê°? í??ì??í?©ë??ë?¤: <a href=\"https://tails.boum.org/download/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/otf/torproject/language/ko_KR/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Kurdish (http://www.transifex.com/otf/torproject/language/ku/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/otf/torproject/language/ku_IQ/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Cornish (http://www.transifex.com/otf/torproject/language/kw/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Kyrgyz (http://www.transifex.com/otf/torproject/language/ky/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Ganda (http://www.transifex.com/otf/torproject/language/lg/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Lingala (http://www.transifex.com/otf/torproject/language/ln/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Lao (http://www.transifex.com/otf/torproject/language/lo/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "NepiecieÅ¡ama palÄ«dzÄ«ba? Lasiet <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>dokumentÄ?ciju</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@xxxxxxxxxx>\n"
 "Language-Team: Malagasy (http://www.transifex.com/otf/torproject/language/mg/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Maori (http://www.transifex.com/otf/torproject/language/mi/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Mongolian (http://www.transifex.com/otf/torproject/language/mn/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Maltese (http://www.transifex.com/otf/torproject/language/mt/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Nahuatl (http://www.transifex.com/otf/torproject/language/nah/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Neapolitan (http://www.transifex.com/otf/torproject/language/nap/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxxxxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Behov for hjelp? Les <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>dokumentasjonen</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@xxxxxxxxxx>\n"
 "Language-Team: Low German (http://www.transifex.com/otf/torproject/language/nds/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Northern Sotho (http://www.transifex.com/otf/torproject/language/nso/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/otf/torproject/language/oc/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Oromo (http://www.transifex.com/otf/torproject/language/om/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Papiamento (http://www.transifex.com/otf/torproject/language/pap/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Piemontese (http://www.transifex.com/otf/torproject/language/pms/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Pushto (http://www.transifex.com/otf/torproject/language/ps/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Precisa de ajuda?Leia a <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>documentação</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@xxxxxxxxxx>\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxxx b/ru@petr1708/ru@xxxxxxxxxxx
index b91360373..972478593 100644
--- a/ru@petr1708/ru@xxxxxxxxxxx
+++ b/ru@petr1708/ru@xxxxxxxxxxx
@@ -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@xxxxxxxxxx>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/otf/torproject/language/ru@petr1708/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Sicilian (http://www.transifex.com/otf/torproject/language/scn/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Scots (http://www.transifex.com/otf/torproject/language/sco/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/otf/torproject/language/sl_SI/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Shona (http://www.transifex.com/otf/torproject/language/sn/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Somali (http://www.transifex.com/otf/torproject/language/so/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxx b/sr@latin/sr@xxxxxxxx
index efdc5edec..f7534c65f 100644
--- a/sr@latin/sr@xxxxxxxx
+++ b/sr@latin/sr@xxxxxxxx
@@ -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@xxxxxxxxxx>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/otf/torproject/language/sr@latin/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Sotho, Southern (http://www.transifex.com/otf/torproject/language/st/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Sundanese (http://www.transifex.com/otf/torproject/language/su/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Behöver du hjälp? Läs <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>dokumentationen</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@xxxxxxxxxx>\n"
 "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Silesian (http://www.transifex.com/otf/torproject/language/szl/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Need help? Read the <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Tajik (http://www.transifex.com/otf/torproject/language/tg/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Turkmen (http://www.transifex.com/otf/torproject/language/tk/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Yardım mı gerekli? <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>Belgeleri</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@xxxxxxxxxx>\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxx b/ug@Arab/ug@xxxxxxx
index 3e2ee7958..7a6b70966 100644
--- a/ug@Arab/ug@xxxxxxx
+++ b/ug@Arab/ug@xxxxxxx
@@ -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@xxxxxxxxxx>\n"
 "Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/otf/torproject/language/ur_PK/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Venda (http://www.transifex.com/otf/torproject/language/ve/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "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/\";>https://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/\";>https://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/\";>documentation</a>"
-msgstr "Cần trợ giúp? Xem <a href=\"https://tails.boum.org/doc/first_steps/installation/\";>tài 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@xxxxxxxxxx>\n"
 "Language-Team: Walloon (http://www.transifex.com/otf/torproject/language/wa/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Wolof (http://www.transifex.com/otf/torproject/language/wo/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "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/\";>https://tails.boum.org/download/</a>"
-msgstr "è¿?è¡? Tails å®?è£?ç¨?åº?ä¹?å??æ?¨é??è¦?ä»? Tails ç½?ç«? <a href=\"https://tails.boum.org/download/\";>https://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/\";>documentation</a>"
-msgstr "é??è¦?帮å?©ï¼?æ?¥ç??<a href=\"https://tails.boum.org/doc/first_steps/installation/\";>æ??æ¡£</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@xxxxxxxxxx>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
 "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/\";>https://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/\";>documentation</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@xxxxxxxxxx>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "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/\";>https://tails.boum.org/download/</a>"
-msgstr "è?¥è¦?å?·è¡? Tails å®?è£?ç¨?å¼?ï¼?ä½ å¿?é ?è¦?å??å¾?此網ç«?ä¸?è¼?ä¸?å?? ISO å½±å??æª?ï¼?<a href=\"https://tails.boum.org/download/\";>https://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/\";>documentation</a>"
-msgstr "é??è¦?幫å?©å??ï¼?è«?é?±è®?<a href=\"https://tails.boum.org/doc/first_steps/installation/\";>說æ??æ??件</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@xxxxxxxxxx>\n"
 "Language-Team: Zulu (http://www.transifex.com/otf/torproject/language/zu/)\n"
 "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/\";>https://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/\";>documentation</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 ""

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