[Pkg-privacy-commits] [tails-installer] 70/70: Update POT and PO files.

Ulrike Uhlig ulrike at moszumanska.debian.org
Mon Nov 20 14:55:07 UTC 2017


This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.

commit 15593521738296adaaf33a4400dc84f29eb5e9fb
Author: anonym <anonym at riseup.net>
Date:   Wed Sep 20 18:02:40 2017 +0200

    Update POT and PO files.
---
 po/ar.po               | 252 +++++++++++++++++------------------------
 po/ast.po              | 228 ++++++++++++++-----------------------
 po/az.po               | 240 +++++++++++++++------------------------
 po/bg.po               | 293 +++++++++++++++++++++++-------------------------
 po/bn_IN.po            | 228 ++++++++++++++-----------------------
 po/bs.po               | 228 ++++++++++++++-----------------------
 po/ca.po               | 252 +++++++++++++++++------------------------
 po/cs.po               | 240 +++++++++++++++------------------------
 po/da.po               | 287 +++++++++++++++++++++++------------------------
 po/de.po               | 252 +++++++++++++++++------------------------
 po/el.po               | 252 +++++++++++++++++------------------------
 po/en_GB.po            | 252 +++++++++++++++++------------------------
 po/es.po               | 291 +++++++++++++++++++++++-------------------------
 po/es_AR.po            | 252 +++++++++++++++++------------------------
 po/eu.po               | 228 ++++++++++++++-----------------------
 po/fa.po               | 252 +++++++++++++++++------------------------
 po/fi.po               | 252 +++++++++++++++++------------------------
 po/fr.po               | 293 +++++++++++++++++++++++-------------------------
 po/fr_CA.po            | 294 ++++++++++++++++++++++++------------------------
 po/gl.po               | 252 +++++++++++++++++------------------------
 po/he.po               | 240 +++++++++++++++------------------------
 po/hr_HR.po            | 287 +++++++++++++++++++++++------------------------
 po/hu.po               | 252 +++++++++++++++++------------------------
 po/id.po               | 244 ++++++++++++++++------------------------
 po/is.po               | 291 +++++++++++++++++++++++-------------------------
 po/it.po               | 290 +++++++++++++++++++++++------------------------
 po/ja.po               | 236 +++++++++++++++------------------------
 po/km.po               | 240 +++++++++++++++------------------------
 po/ko.po               | 252 +++++++++++++++++------------------------
 po/lb.po               | 252 +++++++++++++++++------------------------
 po/lv.po               | 252 +++++++++++++++++------------------------
 po/ms.po               | 228 ++++++++++++++-----------------------
 po/nb.po               | 297 ++++++++++++++++++++++++-------------------------
 po/nds.po              | 228 ++++++++++++++-----------------------
 po/nl.po               | 252 +++++++++++++++++------------------------
 po/nn.po               | 252 +++++++++++++++++------------------------
 po/pa.po               | 228 ++++++++++++++-----------------------
 po/pl.po               | 252 +++++++++++++++++------------------------
 po/pt.po               | 252 +++++++++++++++++------------------------
 po/pt_BR.po            | 252 +++++++++++++++++------------------------
 po/ro.po               | 252 +++++++++++++++++------------------------
 po/ru.po               | 252 +++++++++++++++++------------------------
 po/si_LK.po            | 245 +++++++++++++++-------------------------
 po/sk.po               | 240 +++++++++++++++------------------------
 po/sk_SK.po            | 252 +++++++++++++++++------------------------
 po/sl_SI.po            | 240 +++++++++++++++------------------------
 po/sq.po               | 252 +++++++++++++++++------------------------
 po/sr.po               | 228 ++++++++++++++-----------------------
 po/sr at latin.po         | 228 ++++++++++++++-----------------------
 po/sv.po               | 295 ++++++++++++++++++++++++------------------------
 po/tails-installer.pot | 230 ++++++++++++++------------------------
 po/th.po               | 240 +++++++++++++++------------------------
 po/tr.po               | 291 +++++++++++++++++++++++-------------------------
 po/uk.po               | 252 +++++++++++++++++------------------------
 po/vi.po               | 252 +++++++++++++++++------------------------
 po/zh_CN.po            | 252 +++++++++++++++++------------------------
 po/zh_HK.po            | 252 +++++++++++++++++------------------------
 po/zh_TW.po            | 269 ++++++++++++++++++++++----------------------
 58 files changed, 5981 insertions(+), 8736 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 2a8e519..3b169ff 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-09-24 16:39+0000\n"
 "Last-Translator: Singapore Goldindor\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/"
@@ -122,12 +122,12 @@ 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 "
@@ -135,151 +135,151 @@ msgid ""
 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "خطأ غير معروف ببرنامج dbus عند محاولة تركيب جهاز: %(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 للجهاز '%(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"
@@ -288,18 +288,18 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -333,7 +333,7 @@ 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, "
@@ -343,33 +343,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"طوِر\n"
+"من ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "ثبت تيلز"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -377,7 +389,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -386,36 +398,36 @@ 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -425,34 +437,43 @@ msgstr ""
 "ستقوم بتثبيت تايلز على %(size)s %(vendor)s %(model)s جهاز (%(device)s). كل "
 "البيانات على الجهاز ستمسح. هل تريد الاستمرار؟"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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:\\)"
@@ -460,7 +481,7 @@ msgstr ""
 "لا يمكن استخدام الملف المُحدد. قد يحالفك حظ أكثر إن نقلت ملف الأيزو إلى "
 "المجلد الرئيسي لقرصك (C:\\ على سبيل المثال)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "تم تحديد %(filename)s"
@@ -535,101 +556,26 @@ msgstr "الجهاز المقصود"
 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
-#, fuzzy
-msgid "Install"
-msgstr "ثبت تيلز"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "ثبت تيلز"
 
-#: ../data/tails-installer-launcher.ui.h:5
 #, fuzzy
-msgid "Upgrade"
-msgstr ""
-"طوِر\n"
-"من ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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
-#, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"ثبت\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "ثبت\n"
+#~ "بالاستنساخ"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"طوِر\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "طوِر\n"
+#~ "خلال الإستنساخ"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"طوِر\n"
-"من 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "طوِر\n"
+#~ "من ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/ast.po b/po/ast.po
index 6a9dbaa..06ab48c 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: liveusb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2009-03-21 00:50-0300\n"
 "Last-Translator: Astur <malditoastur at gmail.com>\n"
 "Language-Team: Fedora Asturian <alministradores at softastur.org>\n"
@@ -104,171 +104,171 @@ msgstr "Nun pudo desaniciase'l SO live previu: %s"
 msgid "Cannot find device %s"
 msgstr "Nun pudo alcontrase'l preséu %s"
 
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, fuzzy, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Nun pudo montase'l preséu: %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
 #, fuzzy
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
 "%s tien un sistema de ficheros desconocíu. El so preséu puede que necesite "
 "formatiase."
 
-#: ../tails_installer/creator.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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Nun pudo montase'l preséu: %s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, fuzzy, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Nun pudo montase'l preséu: %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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Nun pudo montase'l preséu: %s"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Nun pudo montase'l preséu: %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
 #, fuzzy, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Nun hai abondu espaciu llibre nel preséu."
 
-#: ../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
 #, fuzzy, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Nun pudo montase'l preséu: %s"
 
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 #, fuzzy
 msgid "Installing bootloader..."
 msgstr "Configurando ya instalando el xestor d'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 ""
 
-#: ../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
 #, fuzzy
 msgid "Unable to find partition"
 msgstr "Nun pudo alcontrase un SO live nel ISO"
 
-#: ../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
 #, fuzzy
 msgid "Unable to find any supported device"
 msgstr "Nun pudo alcontrase denguna unidá removible"
 
-#: ../tails_installer/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"
@@ -278,17 +278,17 @@ msgstr ""
 "Por 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
 #, fuzzy
 msgid "Cannot find"
 msgstr "Nun pudo alcontrase'l preséu %s"
 
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -325,40 +325,48 @@ msgstr "¡Descarga completa!"
 msgid "Tails installation failed!"
 msgstr "¡Descarga completa!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do 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 "
@@ -366,45 +374,45 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "¡Descarga completa!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "¡Descarga completa!"
 
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 #, fuzzy
 msgid "Unable to mount device"
 msgstr "Nun pudo montase'l preséu: %s"
 
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -412,33 +420,42 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
 #, fuzzy
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
@@ -447,7 +464,7 @@ msgstr ""
 "Nun pudo codificase'l nome de ficheru del so cd live. Puedes tener meyor "
 "suerte si mueves el to iso a la raíz del to discu (por exemplu: C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "ISO esbilláu: %s"
@@ -522,89 +539,6 @@ msgstr "Preséu Destín"
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "Usar un CD live esistente"
diff --git a/po/az.po b/po/az.po
index 1836c5c..b8c1fd4 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2014-12-27 20:31+0000\n"
 "Last-Translator: E <ehuseynzade at gmail.com>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/"
@@ -109,12 +109,12 @@ msgstr "Əvvəlki CanlıOS-dən kataloqin çıxarılması alınmır: %(message)s
 msgid "Cannot find device %s"
 msgstr "%s ötürücüsü tapılmır"
 
-#: ../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 "
@@ -123,157 +123,157 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Ötürücünün quraşdırılmasına cəhd göstərildiyi bir vaxtda bilinməyən dbus "
 "kənara çıxması: %(message)s"
 
-#: ../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 yüklənə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 hesablanması"
 
-#: ../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"
@@ -282,17 +282,17 @@ msgstr ""
 "Dəstəklənməyən fayl sistemi: %s\n"
 "Lü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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -329,7 +329,7 @@ msgstr "Quraşdırma tamamlandı! (%s)"
 msgid "Tails installation failed!"
 msgstr "Quraşdırma tamamlandı!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -340,33 +340,46 @@ msgstr ""
 "\"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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Üzünü köçür\n"
+"&&\n"
+"Təkmilləşdir"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Tail-ları Quraşdır"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -374,43 +387,43 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Quraşdırma tamamlandı!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -421,34 +434,43 @@ msgstr ""
 "quraşdırmağı planlaşdırısan. Seçilmiş ötürücüdəki bütün məlumat silinəcək. "
 "Davam edirsən?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Yükləmə sona çatdı!"
 
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Yükləmə alınmadı:"
 
-#: ../tails_installer/gui.py:787
+#: ../tails_installer/gui.py:781
 msgid "You can try again to resume your download"
 msgstr "Yükləməni davam etdirmək üçün yenidən cəhd edə bilərsə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 ""
 "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:\\)"
@@ -456,7 +478,7 @@ 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"
@@ -531,93 +553,11 @@ msgstr "Nişanlanmış Ötürücü"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Tail-ları Quraşdır"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Üzünü köçür\n"
-"&&\n"
-"Təkmilləşdir"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "Tail-ları Quraşdır"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick 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-dan yenilə"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/"
-"first_steps/installation.en.html\">documentation</a>"
-msgstr ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "ISO-dan yenilə"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/bg.po b/po/bg.po
index 435b84e..4968cf3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-10 07:45+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/"
@@ -116,12 +116,12 @@ 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 "
@@ -130,154 +130,154 @@ 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"
@@ -286,18 +286,18 @@ 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."
@@ -332,7 +332,7 @@ 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, "
@@ -343,33 +343,41 @@ msgstr ""
 "раздела 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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO 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 "
@@ -380,7 +388,7 @@ msgstr ""
 "производителя ѝ и 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 "
@@ -389,35 +397,35 @@ 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -428,27 +436,39 @@ msgstr ""
 "(%(device)s). Всички данни на избраното устройство ще бъдат загубени. "
 "Продължавате ли?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Криптираното, постоянно дисково пространство на Tails USB флашката, която "
+"обновявате ще бъде запазено."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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."
@@ -456,7 +476,7 @@ 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:\\)"
@@ -464,7 +484,7 @@ msgstr ""
 "Невъзможност за използване на избрания файл. Може да имате по-голям късмет, "
 "ако се движите ISO до root на вашия диск (ie: C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s избрано"
@@ -543,106 +563,77 @@ msgstr "Инсталиране на:"
 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>"
+#~ msgid "Install Tails"
+#~ msgstr "Инсталиране на Tails"
 
-#: ../data/tails-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 флашката, на която ще се инсталира ще бъде форматирана и всичката ѝ "
-"информация ще бъде изгубена."
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "Обновяване на версията"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Инсталиране на Tails на нова USB флашка."
 
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-"• Обновяване на версията на Tails USB флашлката  до версията на ISO файла."
+#~ msgid ""
+#~ "• The USB stick that you install on is formatted and all data is lost."
+#~ msgstr ""
+#~ "• USB флашката, на която ще се инсталира ще бъде форматирана и всичката ѝ "
+#~ "информация ще бъде изгубена."
 
-#: ../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 флашката, която "
-"обновявате ще бъде запазено."
+#~ msgid "• Upgrade a Tails USB stick to the version of an ISO image."
+#~ msgstr ""
+#~ "• Обновяване на версията на Tails USB флашлката  до версията на ISO файла."
 
-#: ../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>"
+#~ 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 "Инсталиране чрез клониране"
+#~ msgid "Install by cloning"
+#~ msgstr "Инсталиране чрез клониране"
 
-#: ../data/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, който "
-"използвате в момента."
+#~ 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 флашката, която "
-"използвате в момента, няма да бъде копирано."
+#~ 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 "Обноване на версията чрез клониране"
+#~ msgid "Upgrade by cloning"
+#~ msgstr "Обноване на версията чрез клониране"
 
-#: ../data/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, която "
-"използвате в момента."
+#~ 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"
+#~ 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 файл."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 3f6ecbf..1a31157 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2009-11-06 23:29+0530\n"
 "Last-Translator: sankarshan mukhopadhyay <sankarshan at fedoraproject.org>\n"
 "Language-Team: anubad at lists.ankur.org.in\n"
@@ -106,180 +106,180 @@ 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
 #, fuzzy
 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."
@@ -313,40 +313,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 "
@@ -354,44 +362,44 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "ডাউনলোড সম্পূর্ণ!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 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"
@@ -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: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
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "নির্বাচিত ISO: %s"
@@ -504,89 +521,6 @@ msgstr ""
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "উপস্থিত Live CD ব্যবহার করুন"
diff --git a/po/bs.po b/po/bs.po
index c4bd028..eb79d7f 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: liveusb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2009-11-24 20:26+0100\n"
 "Last-Translator: Arnes Arnautović <arnes99 at gmail.com>\n"
 "Language-Team: Bosnian <fedora-trans-bs at redhat.org>\n"
@@ -108,170 +108,170 @@ msgstr "Neuspjelo odstranjivanje prijašnjeg LiveOS-a: %s"
 msgid "Cannot find device %s"
 msgstr "Neuspjelo pronalaženje uređaja %s"
 
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, fuzzy, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Neuspjelo montiranje uređaja: %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
 #, fuzzy
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
 "Nepoznat sistem datoteka za %s. Vaš uređaj bi se možda trebao reformatirati."
 
-#: ../tails_installer/creator.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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Neuspjelo montiranje uređaja: %s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, fuzzy, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Neuspjelo montiranje uređaja: %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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Neuspjelo montiranje uređaja: %s"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Neuspjelo montiranje uređaja: %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
 #, fuzzy, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Nema dovoljno slobodnog prostora na uređaju."
 
-#: ../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
 #, fuzzy, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Neuspjelo montiranje uređaja: %s"
 
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 #, fuzzy
 msgid "Installing bootloader..."
 msgstr "Podešavanje i instalacija bootloader-a..."
 
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
 
-#: ../tails_installer/creator.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
 #, fuzzy
 msgid "Unable to find partition"
 msgstr "Neuspjelo pronalaženje LiveOS-a na ISO"
 
-#: ../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
 #, fuzzy
 msgid "Unable to find any supported device"
 msgstr "Neuspjelo pronalaženje bilo kakvih odstranjivih uređaja"
 
-#: ../tails_installer/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"
@@ -281,17 +281,17 @@ msgstr ""
 "Molimo 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
 #, fuzzy
 msgid "Cannot find"
 msgstr "Neuspjelo pronalaženje uređaja %s"
 
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -328,40 +328,48 @@ msgstr "Snimanje završeno!"
 msgid "Tails installation failed!"
 msgstr "Snimanje završeno!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do 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 "
@@ -369,45 +377,45 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "Snimanje završeno!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Snimanje završeno!"
 
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 #, fuzzy
 msgid "Unable to mount device"
 msgstr "Neuspjelo montiranje uređaja: %s"
 
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -415,33 +423,42 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
 #, fuzzy
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
@@ -450,7 +467,7 @@ msgstr ""
 "Nažalost, postoje poteškoće pri enkodiranju datoteke Vašeg livecd-a.  Možete "
 "imati više sreće ako premjestite Vaš ISO na root Vašeg pogona (npr: C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "ISO odabran: %s"
@@ -525,89 +542,6 @@ msgstr "Ciljani uređaj"
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "Koristi postojeći Live CD"
diff --git a/po/ca.po b/po/ca.po
index 50578e7..0d5e524 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-05-03 15:18+0000\n"
 "Last-Translator: laia_\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
@@ -118,12 +118,12 @@ msgstr ""
 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 "
@@ -132,158 +132,158 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Hi ha hagut unaexcepció dbus desconegua en provar de muntar el dispositiu: "
 "%(message)s"
 
-#: ../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"
@@ -292,18 +292,18 @@ msgstr ""
 "El sistema de fitxers %s no està suportat\n"
 "Deseu 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -340,7 +340,7 @@ msgstr "Instal·lació complerta! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instal·lació complerta!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -351,33 +351,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Actualitza\n"
+"des de una ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instal·la Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -385,7 +397,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -394,36 +406,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instal·lació complerta!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -434,27 +446,36 @@ msgstr ""
 "%(model)s. Es perdran totes les dades al dispositiu seleccionat. Voleu "
 "continuar?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -462,7 +483,7 @@ 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:\\)"
@@ -470,7 +491,7 @@ 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"
@@ -545,101 +566,26 @@ msgstr "Dispositiu de destí"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instal·la Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Actualitza\n"
-"des de una ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instal·la 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instal·la \n"
-"clonant"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instal·la \n"
+#~ "clonant"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Actualitza\n"
-"clonant"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Actualitza\n"
+#~ "clonant"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Actualitza\n"
-"des de una 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Actualitza\n"
+#~ "des de una ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/cs.po b/po/cs.po
index 8b4a4b6..f93a0d8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2015-09-29 17:22+0000\n"
 "Last-Translator: Filip Hruska <fhr at fhrnet.eu>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
@@ -116,12 +116,12 @@ 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 "
@@ -130,154 +130,154 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Neznámá dbus vyjímka při pokusu připojit 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 ""
 
-#: ../tails_installer/creator.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 ""
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1291 ../tails_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"
@@ -286,16 +286,16 @@ msgstr ""
 "Nepodporovaný systém souborů: %s\n"
 "Prosí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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -332,7 +332,7 @@ msgstr "Instalace kompletní! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalace kompletní!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -342,33 +342,46 @@ msgstr ""
 "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 ""
 
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Klonovat\n"
+"&&\n"
+"Upgradovat"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instalace Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -376,7 +389,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -385,36 +398,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instalace kompletní!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -425,34 +438,43 @@ msgstr ""
 "%(vendor)s %(model)s. Všechna data na zvoleném zařízení budou ztracena. "
 "Pokračovat?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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:\\)"
@@ -460,7 +482,7 @@ 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"
@@ -535,93 +557,11 @@ msgstr "Cílové zařízení"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instalace Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Klonovat\n"
-"&&\n"
-"Upgradovat"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "Instalace Tails"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Upgrade z 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "Upgrade z ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/da.po b/po/da.po
index bb8b2d2..9c5bf4b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-20 10:22+0000\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/"
@@ -119,12 +119,12 @@ 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 "
@@ -133,153 +133,153 @@ 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"
@@ -289,18 +289,18 @@ msgstr ""
 "Foretag 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."
@@ -334,7 +334,7 @@ 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, "
@@ -344,33 +344,41 @@ msgstr ""
 "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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../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 "
@@ -381,7 +389,7 @@ msgstr ""
 "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 "
@@ -390,35 +398,35 @@ 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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -428,27 +436,39 @@ msgstr ""
 "Du har valgt at installere Tails på %(size)s %(vendor)s %(model)s enheden "
 "(%(device)s). Alt data på den valgte enhed tabes. Fortsæt?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Det krypterede vedvarende lager på Tails USB-pennen som du opgradere "
+"bevares."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -456,7 +476,7 @@ 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:\\)"
@@ -464,7 +484,7 @@ 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"
@@ -543,103 +563,74 @@ msgstr "Målenhed:"
 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 ""
-"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."
+#~ msgid "Install Tails"
+#~ msgstr "Installer 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-pennen som du installere på formateres og al data går tabt."
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "Opgrader"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Installer Tails på en ny USB-pen."
 
-#: ../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."
+#~ 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: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."
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/de.po b/po/de.po
index 2172be7..ba55ae8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: Emilio Salano <unkn0wn_user at posteo.de>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/"
@@ -143,12 +143,12 @@ msgstr ""
 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. Es wird übersprungen."
 
-#: ../tails_installer/creator.py:719
+#: ../tails_installer/creator.py:725
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
@@ -157,157 +157,157 @@ 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 für %s. Ihr Gerät muss 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Unbekannte dbus-Ausnahme während des Einhängens des Gerätes: %(message)s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Medium 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 ""
 
-#: ../tails_installer/creator.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 ""
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1291 ../tails_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 konnte kein unterstütztes Medium gefunden werden"
 
-#: ../tails_installer/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"
@@ -317,18 +317,18 @@ msgstr ""
 "Bitte 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -365,7 +365,7 @@ msgstr "Installation abgeschlossen! (%s) "
 msgid "Tails installation failed!"
 msgstr "Installation abgeschlossen!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -376,33 +376,45 @@ msgstr ""
 "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_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Aus ISO\n"
+"aktualisieren"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Tails installieren"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -410,7 +422,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -419,36 +431,36 @@ 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 ""
 
-#: ../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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Installation abgeschlossen!"
 
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
 msgstr "Medium 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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -459,27 +471,36 @@ msgstr ""
 "%(vendor)s %(model)s (%(device)s). Alle Daten auf dem ausgewählten Medium "
 "gehen verloren. Fortfahren?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -487,7 +508,7 @@ 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:\\)"
@@ -496,7 +517,7 @@ msgstr ""
 "funktioniert es, wenn Sie die ISO Datei direkt in einem Laufwerk  (z.B. C:"
 "\\) ablegen."
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s ausgewählt"
@@ -571,101 +592,26 @@ msgstr "Zielmedium"
 msgid "Reinstall (delete all data)"
 msgstr ""
 
-#: ../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 ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-#, fuzzy
-msgid "Install"
-msgstr "Tails installieren"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Aus ISO\n"
-"aktualisieren"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Tails installieren"
 
-#: ../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
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Durch Klonen\n"
-"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 ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Durch Klonen\n"
+#~ "installieren"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Durch Klonen\n"
-"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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Durch Klonen\n"
+#~ "aktualisieren"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Aus ISO\n"
-"aktualisieren"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/"
-"first_steps/installation.en.html\">documentation</a>"
-msgstr ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Aus ISO\n"
+#~ "aktualisieren"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/el.po b/po/el.po
index 33068d7..03b9955 100644
--- a/po/el.po
+++ b/po/el.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: metamec\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
@@ -122,12 +122,12 @@ 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 "
@@ -136,156 +136,156 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Άγνωστη εξαίρεση dbus κατά την προσπάθεια προσάρτησης της συσκευής: "
 "%(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 για '%(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"
@@ -295,18 +295,18 @@ msgstr ""
 "Παρακαλώ δημιουργείστε ένα αντίγραφο ασφαλείας και μορφοποιήστε τη συσκευή "
 "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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -343,7 +343,7 @@ 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, "
@@ -354,33 +354,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Αναβάθμιση\n"
+"μέσω ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Εγκατάσταση του Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -388,7 +400,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -397,36 +409,36 @@ 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -436,27 +448,36 @@ msgstr ""
 "Πρόκειται να εγκαταστήσετε το Tails στο %(size)s %(vendor)s %(model)s δίσκο "
 "(%(device)s). Όλα τα υπάρχοντα δεδομένα θα χαθούν. Συνέχεια;"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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."
@@ -464,7 +485,7 @@ 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:\\)"
@@ -472,7 +493,7 @@ msgstr ""
 "Αδυναμία χρήσης του επιλεγμένου αρχείου. Μπορεί να έχετε καλύτερη τύχη αν "
 "μετακινήσετε το ISO στη ριζα του δίσκου σας (πχ C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "επιλέχθηκαν %(filename)s"
@@ -547,101 +568,26 @@ msgstr "Στοχος"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Εγκατάσταση του Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Αναβάθμιση\n"
-"μέσω ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Εγκατάσταση\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Εγκατάσταση\n"
+#~ "μέσω κλωνοποίησης"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Αναβάθμιση\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Αναβάθμιση\n"
+#~ "μέσω κλωνοποίησης"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Αναβάθμιση\n"
-"μέσω 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Αναβάθμιση\n"
+#~ "μέσω ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 934d087..7ac0e23 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: Andi Chandler <andi at gowling.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/"
@@ -114,12 +114,12 @@ 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 "
@@ -128,152 +128,152 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Unknown dbus 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 ""
 
-#: ../tails_installer/creator.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"
@@ -282,17 +282,17 @@ msgstr ""
 "Unsupported filesystem: %s\n"
 "Please 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -329,7 +329,7 @@ msgstr "Installation complete! (%s)"
 msgid "Tails installation failed!"
 msgstr "Installation complete!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -339,33 +339,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Upgrade\n"
+"from ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Install Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -373,7 +385,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -382,36 +394,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Installation complete!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -421,27 +433,36 @@ msgstr ""
 "You are going to install Tails on the %(size)s %(vendor)s %(model)s device "
 "(%(device)s). All data on the selected device will be lost. Continue?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)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."
@@ -449,7 +470,7 @@ 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:\\)"
@@ -457,7 +478,7 @@ 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"
@@ -532,101 +553,26 @@ msgstr "Target Device"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Install Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Upgrade\n"
-"from ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Install 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Install\n"
-"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 ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Install\n"
+#~ "by cloning"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Upgrade\n"
-"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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Upgrade\n"
+#~ "by cloning"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Upgrade\n"
-"from 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Upgrade\n"
+#~ "from ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/es.po b/po/es.po
index 05145ff..c27844c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-10 12:10+0000\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/"
@@ -133,12 +133,12 @@ msgstr ""
 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 "
@@ -147,160 +147,160 @@ 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"
@@ -310,18 +310,18 @@ msgstr ""
 "Por 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."
@@ -356,7 +356,7 @@ 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, "
@@ -367,34 +367,42 @@ msgstr ""
 "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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../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 "
@@ -405,7 +413,7 @@ msgstr ""
 "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 "
@@ -414,35 +422,35 @@ 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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -453,27 +461,39 @@ msgstr ""
 "(%(device)s). Todos los datos en el dispositivo seleccionado se perderán "
 "¿Continuar?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Se preserva el almacenamiento cifrado persistente de la memoria USB de "
+"Tails que actualices,"
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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 "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."
@@ -481,7 +501,7 @@ 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:\\)"
@@ -489,7 +509,7 @@ 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)"
@@ -568,104 +588,77 @@ msgstr "Dispositivo objetivo:"
 msgid "Reinstall (delete all data)"
 msgstr ""
 
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Instalar Tails"
+#~ 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"
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "Actualización"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "Instalar Tails en un nuevo dispositivo USB"
 
-#: ../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."
+#~ 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: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,"
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/es_AR.po b/po/es_AR.po
index 70620fe..93c7c0c 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-05-13 00:49+0000\n"
 "Last-Translator: Joaquín Serna\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/"
@@ -117,12 +117,12 @@ 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 "
@@ -131,159 +131,159 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Excepción de dbus desconocida al intentar 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 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 ""
 
-#: ../tails_installer/creator.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 ""
 
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1291 ../tails_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"
@@ -293,18 +293,18 @@ msgstr ""
 "Haga 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -341,7 +341,7 @@ msgstr "Instalación completa! (%s)"
 msgid "Tails installation failed!"
 msgstr "¡Instalación completa!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -352,33 +352,45 @@ msgstr ""
 "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 ""
 
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Actualizar \n"
+"desde una ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instalar Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -386,7 +398,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -395,36 +407,36 @@ 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 ""
 
-#: ../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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "¡Instalación completa!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -435,27 +447,36 @@ msgstr ""
 "%(model)s de %(size)s). Todos los datos de este se perderán. ¿Desea "
 "continuar?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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."
@@ -463,7 +484,7 @@ 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:\\)"
@@ -471,7 +492,7 @@ 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"
@@ -546,101 +567,26 @@ msgstr "Dispositivo de Destino"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instalar Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instalar Tails"
 
-#: ../data/tails-installer-launcher.ui.h:5
 #, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Actualizar \n"
-"desde una ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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
-#, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instalar\n"
-"por clonado"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instalar\n"
+#~ "por clonado"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Actualizar\n"
-"por 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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Actualizar\n"
+#~ "por clonado"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Actualizar \n"
-"desde una 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Actualizar \n"
+#~ "desde una ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/eu.po b/po/eu.po
index f767ade..170b17d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2012-12-12 16:49+0000\n"
 "Last-Translator: Antxon Baldarra <baldarra at euskalerria.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -107,12 +107,12 @@ 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
 #, fuzzy, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
@@ -121,156 +121,156 @@ msgstr ""
 "%(device)s USB gailuaren partizio batzuk muntatuta daude. Desmuntatu egingo "
 "dira instalazio prozesua hasi baino lehen."
 
-#: ../tails_installer/creator.py:762 ../tails_installer/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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "dbus salbuespen ezezaguna gailua muntatzerakoan: %(message)s"
 
-#: ../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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "%(device)s desmuntatzen"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "%(device)s desmuntatzen"
 
-#: ../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
 #, fuzzy, python-format
 msgid "Partitioning device %(device)s"
 msgstr "%(device)s gailuan ez dago leku askerik."
 
-#: ../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 "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
 #, fuzzy
 msgid "Unable to find any supported device"
 msgstr "Ezin da gailu eramangarririk 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"
@@ -280,17 +280,17 @@ msgstr ""
 "Mesedez 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -327,7 +327,7 @@ msgstr "Instalazioa burutu da! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalazioa burutu da!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -337,33 +337,41 @@ msgstr ""
 "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 "
@@ -371,43 +379,43 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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 "Instalazioa burutu da!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instalazioa burutu da!"
 
-#: ../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"
@@ -415,27 +423,36 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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 "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
 #, fuzzy
 msgid ""
 "The selected file is unreadable. Please fix its permissions or select "
@@ -444,7 +461,7 @@ msgstr ""
 "Hautatutako fitxategia ezin da irakurri. Mesedez bere baimenak aldatu edo "
 "beste fitxategi bat hautatu."
 
-#: ../tails_installer/gui.py:801
+#: ../tails_installer/gui.py:795
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\\)"
@@ -452,7 +469,7 @@ 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"
@@ -526,89 +543,6 @@ msgstr ""
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "Dagoen Live OS kentzen"
diff --git a/po/fa.po b/po/fa.po
index bedbe1f..7804bd1 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-05-19 07:01+0000\n"
 "Last-Translator: Amir Moezzi <amirreza.mz at yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/"
@@ -121,12 +121,12 @@ 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 "
@@ -135,156 +135,156 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "اسنثناء ناشاخته در dbus هنگام تلاش برای نصب دستگاه: %(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 ""
 
-#: ../tails_installer/creator.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"
@@ -294,18 +294,18 @@ msgstr ""
 "لطفا از وسیله یو‌اس‌بی خود پشتیبانی گرفته و آن را با فایل سیستم 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -342,7 +342,7 @@ 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, "
@@ -352,33 +352,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"ارتقا\n"
+"از ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "نصب مسیرها"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -386,7 +398,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -395,36 +407,36 @@ 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -434,27 +446,36 @@ msgstr ""
 "شما قصد نصب تیلز روی این دستگاه را دارید: %(size)s %(vendor)s %(model)s :"
 "(%(device)s). همه ی اطلاعات موجود روی آن پاک خواهد شد. مطمئن هستید؟"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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."
@@ -462,7 +483,7 @@ 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:\\)"
@@ -470,7 +491,7 @@ msgstr ""
 "قادر به استفاده از فايل انتخاب شده نيست. اگر فايل ايزو را به ريشه درايو خود "
 "(مثلاً C) منتقل كنيد ممكن است شانس بيتشري داشته باشيد."
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s انتخاب شده"
@@ -545,101 +566,26 @@ msgstr "دستگاه هدف"
 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
-#, fuzzy
-msgid "Install"
-msgstr "نصب مسیرها"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"ارتقا\n"
-"از ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ 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
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"نصب\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "نصب\n"
+#~ "توسط شبیه سازی"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"ارتقا\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "ارتقا\n"
+#~ "توسط شبیه سازی"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"ارتقا\n"
-"از 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "ارتقا\n"
+#~ "از ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/fi.po b/po/fi.po
index 1a928cb..00ee431 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-08-29 17:25+0000\n"
 "Last-Translator: Pietu1998 <smiley at pietu1998.net>\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/"
@@ -120,12 +120,12 @@ msgstr ""
 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 "
@@ -134,153 +134,153 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Dbusissa tuntematon poikkeus, kun laitetta liitettiin: %(message)s"
 
-#: ../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"
@@ -289,17 +289,17 @@ msgstr ""
 "Tiedostojärjestelmää ei tueta: %s\n"
 "Tee 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -336,7 +336,7 @@ msgstr "Asennus on valmis! (%s)"
 msgid "Tails installation failed!"
 msgstr "Asennus on valmis!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -347,33 +347,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Päivitä\n"
+"ISO-levykuvalta"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Asenna Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -381,7 +393,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -390,36 +402,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Asennus on valmis!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -429,27 +441,36 @@ msgstr ""
 "Olet asentamassa Tailsin %(size)s %(vendor)s %(model)s laitteelle "
 "(%(device)s). Kaikki tiedot asemalta menetetään. Jatketaanko?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -457,7 +478,7 @@ 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:\\)"
@@ -465,7 +486,7 @@ 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"
@@ -540,101 +561,26 @@ msgstr "Kohdelaite"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Asenna Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Päivitä\n"
-"ISO-levykuvalta"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Asenna 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Asenna\n"
-"kloonaamalla"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Asenna\n"
+#~ "kloonaamalla"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Päivitä\n"
-"kloonaamalla"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Päivitä\n"
+#~ "kloonaamalla"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Päivitä\n"
-"ISO-levykuvalta"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/"
-"first_steps/installation.en.html\">documentation</a>"
-msgstr ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Päivitä\n"
+#~ "ISO-levykuvalta"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/fr.po b/po/fr.po
index eb0b701..65b896f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-18 17:15+0000\n"
 "Last-Translator: Tails translators <tails at boum.org>\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/"
@@ -134,12 +134,12 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Périphérique %s 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 "
@@ -148,159 +148,159 @@ 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 "Système de fichiers inconnu. Votre périphérique doit être reformaté."
 
-#: ../tails_installer/creator.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 lors de la tentative de montage du 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 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 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 ""
 "Périphérique '%(device)s' non pris en charge, veuillez signaler le bogue."
 
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Nous nous efforçons 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 syslinux"
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lecture du MBR extrait depuis %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 le MBR extrait depuis %(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 du 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 "
 "du 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 "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 d'examen 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 qu'elle est 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"
@@ -310,18 +310,18 @@ msgstr ""
 "Veuillez 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."
@@ -356,7 +356,7 @@ msgstr "Installation 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, "
@@ -367,33 +367,41 @@ msgstr ""
 "Compatibilité, cochez la case \"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 "Installeur de Tails"
 
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+msgid "Upgrade"
+msgstr "Mise à jour"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Installation"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../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 adapté pour installer Tails n'a été trouvé"
 
-#: ../tails_installer/gui.py:526
+#: ../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 brancher 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 "
@@ -404,7 +412,7 @@ msgstr ""
 "fabricant et Tails devrait échouer à démarrer dessus. Veuillez essayer avec "
 "un autre modèle."
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -413,35 +421,35 @@ msgstr ""
 "Le périphérique « %(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 durant l'installation de Tails"
 
-#: ../tails_installer/gui.py:604
+#: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
 msgstr "Rafraîchissement des versions..."
 
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Versions mises à jour !"
 
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installation 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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -452,27 +460,39 @@ msgstr ""
 "(%(device)s). Toutes les données sur le périphérique sélectionné seront "
 "perdues. Poursuivre ?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Le stockage persistant chiffré de la clé USB Tails mise à jour sera "
+"préservé."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../tails_installer/gui.py:776
 msgid "Download complete!"
 msgstr "Téléchargement terminé !"
 
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 msgid "Download failed: "
 msgstr "Échec du 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 essayer de 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."
@@ -480,7 +500,7 @@ 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:\\)"
@@ -488,7 +508,7 @@ msgstr ""
 "Impossible d'utiliser le fichier choisi. Vous devriez avoir 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é"
@@ -567,106 +587,77 @@ msgstr "Périphérique cible :"
 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 ""
-"Pour utiliser l'Installeur de Tails vous avez besoin d'une image ISO pouvant "
-"être téléchargée depuis le site web de Tails : <a href=\"https://tails.boum."
-"org/download/\">https://tails.boum.org/download/</a>"
+#~ msgid "Install Tails"
+#~ msgstr "Installer Tails"
 
-#: ../data/tails-installer-launcher.ui.h:2
-msgid "Install"
-msgstr "Installation"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installer Tails sur une nouvelle clé USB."
+#~ msgid ""
+#~ "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 utiliser l'Installeur de Tails vous avez besoin d'une image ISO "
+#~ "pouvant être téléchargée depuis le site web de Tails : <a href=\"https://"
+#~ "tails.boum.org/download/\">https://tails.boum.org/download/</a>"
 
-#: ../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 Tails sera formatée et toutes les "
-"données seront perdues."
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Installer Tails sur une nouvelle clé USB."
 
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Mise à jour"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "• Mettre à jour une clé USB Tails avec une image ISO."
+#~ msgid ""
+#~ "• The USB stick that you install on is formatted and all data is lost."
+#~ msgstr ""
+#~ "• La clé USB sur laquelle vous installez Tails sera formatée et toutes "
+#~ "les données seront perdues."
 
-#: ../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 Tails mise à jour sera "
-"préservé."
+#~ msgid "• Upgrade a Tails USB stick to the version of an ISO image."
+#~ msgstr "• Mettre à jour une clé USB Tails avec une image ISO."
 
-#: ../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 ? Lisez la <a href=\"https://tails.boum.org/doc/first_steps/"
-"installation/\">documentation</a>"
+#~ msgid ""
+#~ "Need help? Read the <a href=\"https://tails.boum.org/doc/first_steps/"
+#~ "installation/\">documentation</a>"
+#~ msgstr ""
+#~ "Besoin d'aide ? Lisez 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 "Installation par clonage"
+#~ msgid "Install by cloning"
+#~ msgstr "Installation 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 "
-"êtes en train d'utiliser."
+#~ 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 êtes en train d'utiliser."
 
-#: ../data/tails-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 ne sera pas "
-"copié."
+#~ 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 ne sera "
+#~ "pas copié."
 
-#: ../data/tails-installer-launcher.ui.h:12
-msgid "Upgrade by cloning"
-msgstr "Mise à jour par clonage"
+#~ msgid "Upgrade by cloning"
+#~ msgstr "Mise à jour 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 à jour une autre clé USB vers la même version de Tails que vous "
-"êtes en train d'utiliser."
+#~ msgid ""
+#~ "• Upgrade another Tails USB stick to the same version of Tails that you "
+#~ "are currently using."
+#~ msgstr ""
+#~ "• Mettre à jour une autre clé USB vers la même version de Tails que vous "
+#~ "êtes en train d'utiliser."
 
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Mise à jour à partir d'une ISO"
+#~ msgid "Upgrade from ISO"
+#~ msgstr "Mise à jour à 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 à jour une autre clé USB Tails vers la version d'une image ISO."
+#~ msgid "• Upgrade another Tails USB stick to the version of an ISO image."
+#~ msgstr ""
+#~ "• Mettre à jour 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 ? Lisez la <a href=\"file:///usr/share/doc/tails/website/doc/"
-"first_steps/installation.fr.html\">documentation</a>"
+#~ 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 ? Lisez la <a href=\"file:///usr/share/doc/tails/website/"
+#~ "doc/first_steps/installation.fr.html\">documentation</a>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 778526c..b3fca4a 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-12 15:01+0000\n"
 "Last-Translator: French language coordinator <french.coordinator at rbox.me>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/"
@@ -123,12 +123,12 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Périphérique %s 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 "
@@ -137,158 +137,158 @@ 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 "Système de fichiers inconnu. Votre périphérique doit être reformaté."
 
-#: ../tails_installer/creator.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 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 ""
 "Périphérique « %(device)s » non prise en charge, veuillez signaler le bogue."
 
-#: ../tails_installer/creator.py:974
+#: ../tails_installer/creator.py:979
 msgid "Trying to continue anyway."
 msgstr "Nous nous efforçons 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 '%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 "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 syslinux' gptmbr.bin"
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr "Lecture du MBR 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 le MBR 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 "
 "du 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 "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 d'examen 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 qu'elle est 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"
@@ -298,18 +298,18 @@ msgstr ""
 "Veuillez 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."
@@ -344,7 +344,7 @@ msgstr "Installation 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, "
@@ -355,33 +355,41 @@ msgstr ""
 "compatibilité, cocher la case \"Lancer 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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../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 "
@@ -392,7 +400,7 @@ msgstr ""
 "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 "
@@ -401,35 +409,35 @@ 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 "Rafraîchissement des versions..."
 
-#: ../tails_installer/gui.py:609
+#: ../tails_installer/gui.py:601
 msgid "Releases updated!"
 msgstr "Versions mises à jour!"
 
-#: ../tails_installer/gui.py:651
+#: ../tails_installer/gui.py:643
 msgid "Installation complete!"
 msgstr "Installation 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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -440,27 +448,39 @@ msgstr ""
 "(%(device)s). Toutes les données sur le périphérique sélectionné seront "
 "perdues. Poursuivre?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Le stockage persistant chiffré de la clé USB que vous mettez à niveau est "
+"préservé."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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 essayer de 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."
@@ -468,7 +488,7 @@ 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:\\)"
@@ -476,7 +496,7 @@ msgstr ""
 "Impossible d'utiliser le fichier choisi. Vous devriez avoir 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é"
@@ -555,106 +575,78 @@ msgstr "Périphérique cible :"
 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 ""
-"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>"
+#~ msgid "Install Tails"
+#~ msgstr "Installer Tails"
 
-#: ../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"
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "Mettre à niveau"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Installer Tails sur une nouvelle clé USB."
 
-#: ../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."
+#~ 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: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é."
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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é."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/gl.po b/po/gl.po
index d630ba6..3ad1455 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: Xan VFR\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/"
@@ -111,12 +111,12 @@ 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 "
@@ -125,157 +125,157 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Excepción dbus descoñecida mentras tentaba 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 "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"
@@ -285,18 +285,18 @@ msgstr ""
 "Por 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -333,7 +333,7 @@ msgstr "Instalación completa! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalación completa!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -343,33 +343,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Actualizar\n"
+"dende ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instalar Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -377,7 +389,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -386,36 +398,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instalación completa!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -426,27 +438,36 @@ msgstr ""
 "(%(device)s).  Tódolos datos no dispositivo seleccionado perderanse. "
 "Continuar?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -454,7 +475,7 @@ 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:\\)"
@@ -462,7 +483,7 @@ 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"
@@ -537,101 +558,26 @@ msgstr "Dispositivo Destino"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instalar Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Actualizar\n"
-"dende ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instalar 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instalar\n"
-"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 ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instalar\n"
+#~ "clonando"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Actualizar\n"
-"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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Actualizar\n"
+#~ "clonando"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Actualizar\n"
-"dende 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Actualizar\n"
+#~ "dende ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/he.po b/po/he.po
index a8cb8f9..652a088 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2015-09-24 05:02+0000\n"
 "Last-Translator: Johnny Diralenzo\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/"
@@ -114,12 +114,12 @@ 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 "
@@ -128,152 +128,152 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "טעות dbus לא ידועה כשמנסים לצרף מכשיר: %(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 בעבור \"%(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"
@@ -282,16 +282,16 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -326,7 +326,7 @@ 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, "
@@ -336,33 +336,46 @@ msgstr ""
 "הסמל ולפתוח את המאפיינים. בכרטיסיית התאימות, סמן את התיבה הפעל תכנית זו "
 "ב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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"שכפל\n"
+"&&\n"
+"שדרג"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "התקן Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -370,7 +383,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -379,36 +392,36 @@ 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -418,33 +431,42 @@ msgstr ""
 "אתה הולך להתקין את Tails %(size)s %(vendor)s %(model)s במכשיר (%(device)s). "
 "כל הנתונים שבהתקן שנבחר ייאבדו. להמשיך?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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:\\)"
@@ -452,7 +474,7 @@ msgstr ""
 "אי אפשר להשתמש בקובץ  הנבחר. יכול להיות שתצליח אם תעביר את ה ISO  \n"
 "שלך למחיצה הראשית של הכונן (למשל, \\  :C)."
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s נבחר"
@@ -527,93 +549,11 @@ msgstr "מכשיר היעד"
 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
-#, fuzzy
-msgid "Install"
-msgstr "התקן Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"שכפל\n"
-"&&\n"
-"שדרג"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "התקן Tails"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "שדרוג מ-ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 988e0a4..707c9ed 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-28 07:40+0000\n"
 "Last-Translator: Nives Miletic <nives.miletic at gmail.com>\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/"
@@ -115,12 +115,12 @@ 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 "
@@ -129,152 +129,152 @@ 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"
@@ -284,17 +284,17 @@ msgstr ""
 "Molimo 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."
@@ -329,7 +329,7 @@ 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, "
@@ -340,33 +340,41 @@ msgstr ""
 "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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails 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 "
@@ -377,7 +385,7 @@ msgstr ""
 "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 "
@@ -386,35 +394,35 @@ 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -424,27 +432,38 @@ msgstr ""
 "Instalirati ćete Tails na %(size)s %(vendor)s %(model)s uređaj (%(device)s). "
 "Svi podatci na odabranom uređaju će biti izgubljeni. Nastaviti?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Enkriptirana trajna pohrana Tails USB-a kojeg nadograđujete je sačuvana."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -452,7 +471,7 @@ 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:\\)"
@@ -460,7 +479,7 @@ 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"
@@ -539,102 +558,76 @@ msgstr "Ciljani uređaj:"
 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"
+#~ msgid "Install Tails"
+#~ msgstr "Instaliraj Tails"
 
-#: ../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."
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "Nadogradnja"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Instalacija Tailsa na novi USB."
 
-#: ../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."
+#~ 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: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."
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/hu.po b/po/hu.po
index 30b23d5..2d54a06 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-06-20 22:55+0000\n"
 "Last-Translator: Blackywantscookies\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/"
@@ -117,12 +117,12 @@ 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 "
@@ -131,153 +131,153 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Ismeretlen dbus kivétel eszköz csatlakoztatásakor: %(message)s"
 
-#: ../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 ""
 
-#: ../tails_installer/creator.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"
@@ -287,17 +287,17 @@ msgstr ""
 "Ké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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -334,7 +334,7 @@ msgstr "Telepítés kész! (%s)"
 msgid "Tails installation failed!"
 msgstr "Telepítés kész!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -345,33 +345,45 @@ msgstr ""
 "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_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Frissítés\n"
+"ISO-ból"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Tails telepítése"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -379,7 +391,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -388,36 +400,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Telepítés kész!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -427,27 +439,36 @@ msgstr ""
 "Telepíteni fogod a Tails-t %(size)s %(vendor)s %(model)s eszköz "
 "(%(device)s). Minden adat a választott eszközön törlődni fog. Folytatod?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -455,7 +476,7 @@ 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:\\)"
@@ -463,7 +484,7 @@ 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"
@@ -538,101 +559,26 @@ msgstr "Cél eszköz"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Tails telepítése"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Frissítés\n"
-"ISO-ból"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Tails telepítése"
 
-#: ../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
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Telepítés\n"
-"klónozással"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Telepítés\n"
+#~ "klónozással"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Frissítés\n"
-"klónozással"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Frissítés\n"
+#~ "klónozással"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Frissítés\n"
-"ISO-ból"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/"
-"first_steps/installation.en.html\">documentation</a>"
-msgstr ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Frissítés\n"
+#~ "ISO-ból"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/id.po b/po/id.po
index 42ed38b..8a7fae8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: adhisuryo <adhisuryo at gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/"
@@ -116,12 +116,12 @@ 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 "
@@ -130,153 +130,153 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Tidak dikenal dbus kecuali selagi mencoba ke mount device: %(message)s"
 
-#: ../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"
@@ -285,18 +285,18 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -333,7 +333,7 @@ msgstr "Pemasangan sudah tuntas! (%s)"
 msgid "Tails installation failed!"
 msgstr "Pemasangan sudah tuntas!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -343,33 +343,43 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr "Mutakhirkan dari ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Pasang Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -377,7 +387,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -386,36 +396,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Pemasangan sudah tuntas!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -425,27 +435,36 @@ msgstr ""
 "Anda akan instal Tails pada %(size)s %(vendor)s %(model)s device "
 "(%(device)s). Semua data pada perangkat terpilih akan hilang . Lanjutkan?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -453,7 +472,7 @@ 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:\\)"
@@ -461,7 +480,7 @@ 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"
@@ -536,97 +555,24 @@ msgstr "Perangkat target"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Pasang Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr "Mutakhirkan dari ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Pasang Tails"
 
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instal\n"
-"dengan cara klon"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instal\n"
+#~ "dengan cara klon"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Mutakhirkan\n"
-"dengan cara klon"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Mutakhirkan\n"
+#~ "dengan cara klon"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr "Mutakhirkan dari 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "Mutakhirkan dari ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/is.po b/po/is.po
index 89bad76..f491468 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-19 17:31+0000\n"
 "Last-Translator: Sveinn í Felli <sv1 at fellsnet.is>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/"
@@ -110,12 +110,12 @@ 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 "
@@ -124,154 +124,154 @@ 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"
@@ -280,18 +280,18 @@ msgstr ""
 "Óstutt skráakerfi: %s\n"
 "Taktu ö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."
@@ -326,7 +326,7 @@ 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, "
@@ -337,35 +337,43 @@ msgstr ""
 "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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../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 "
@@ -376,7 +384,7 @@ msgstr ""
 "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 "
@@ -385,35 +393,35 @@ 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -423,27 +431,39 @@ msgstr ""
 "Þú ert að fara að setja Tails upp á %(size)s %(vendor)s %(model)s tækinu "
 "(%(device)s). Öll gögn á valda tækinu munu tapast. Halda áfram?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Varanlegu gagnageymslunni á Tails USB-lyklinum sem þú ert að nota núna er "
+"haldið til haga."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -451,7 +471,7 @@ 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:\\)"
@@ -459,7 +479,7 @@ 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ð"
@@ -538,105 +558,76 @@ msgstr "Viðtökutæki:"
 msgid "Reinstall (delete all data)"
 msgstr ""
 
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Setja upp Tails"
+#~ 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."
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "Uppfæra"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Setja Tails upp á nýjan USB-minnislykil."
 
-#: ../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."
+#~ 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: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."
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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ð."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/it.po b/po/it.po
index 293de9c..c9c5936 100644
--- a/po/it.po
+++ b/po/it.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-13 13:24+0000\n"
 "Last-Translator: Random_R\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/"
@@ -127,12 +127,12 @@ msgstr ""
 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 "
@@ -141,157 +141,157 @@ 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"
@@ -300,18 +300,18 @@ msgstr ""
 "Filesystem non supportato: %s\n"
 "Eseguire 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."
@@ -346,7 +346,7 @@ 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, "
@@ -357,33 +357,41 @@ msgstr ""
 "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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../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 "
@@ -394,7 +402,7 @@ msgstr ""
 "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 "
@@ -403,35 +411,35 @@ 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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -442,27 +450,39 @@ msgstr ""
 "(%(device)s). Tutti i dati sul dispositivo selezionato verranno persi. "
 "Continuare?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• La memoria persistente cifrata della chiave USB Tails che aggiorni viene "
+"conservata."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -470,7 +490,7 @@ 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:\\)"
@@ -478,7 +498,7 @@ 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"
@@ -557,104 +577,76 @@ msgstr "Dispositivo di destinazione:"
 msgid "Reinstall (delete all data)"
 msgstr ""
 
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Installare Tails"
+#~ 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."
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "Aggiorna"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Installa Tails su una nuova chiave USB."
 
-#: ../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."
+#~ 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: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."
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/ja.po b/po/ja.po
index 155f10a..982aa05 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: Tokumei Nanashi\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/"
@@ -116,12 +116,12 @@ 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 "
@@ -130,155 +130,155 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "デバイスのマウントを試行中不明なdbus例外: %(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 ""
 
-#: ../tails_installer/creator.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"
@@ -288,18 +288,18 @@ msgstr ""
 "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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -336,7 +336,7 @@ 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, "
@@ -346,33 +346,43 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr "ISOイメージからアップグレードする"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Tailsをインストール"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/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,7 +390,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -389,36 +399,36 @@ 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -428,27 +438,36 @@ msgstr ""
 "%(size)s %(vendor)s %(model)s デバイス (%(device)s) にTailsをインストールしま"
 "す。選択されたデバイスのすべてのデータが失われます。続行しますか?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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."
@@ -456,7 +475,7 @@ 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:\\)"
@@ -464,7 +483,7 @@ msgstr ""
 "選択されたファイルを使用できません。ISO をデバイスのルート(例えば C:\\) に移"
 "動するとさらに上手くいくかもしれません。"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)sが選択されました"
@@ -539,93 +558,20 @@ msgstr "対象ドライブ"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Tailsをインストール"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Tailsをインストール"
 
-#: ../data/tails-installer-launcher.ui.h:5
 #, fuzzy
-msgid "Upgrade"
-msgstr "ISOイメージからアップグレードする"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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
-#, fuzzy
-msgid "Install by cloning"
-msgstr "クローニングでインストールする"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr "クローニングでインストールする"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr "クローニングでアップグレードする"
+#~ msgid "Upgrade by cloning"
+#~ msgstr "クローニングでアップグレードする"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "ISOイメージからアップグレードする"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/km.po b/po/km.po
index 9dc2e6b..c1574a3 100644
--- a/po/km.po
+++ b/po/km.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2014-12-03 11:44+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/"
@@ -109,12 +109,12 @@ 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 "
@@ -123,151 +123,151 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "មិន​ស្គាល់​ការ​លើកលែង dbus ពេល​ព្យាយាម​ម៉ោន​ឧបករណ៍៖ %(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 ""
 
-#: ../tails_installer/creator.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"
@@ -276,16 +276,16 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -319,7 +319,7 @@ 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, "
@@ -328,33 +328,46 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"ក្លូន\n"
+"&&\n"
+"ធ្វើ​បច្ចុប្បន្នភាព"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "ដំឡើង Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -362,43 +375,43 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -408,33 +421,42 @@ msgstr ""
 "អ្នក​នឹង​ដំឡើង Tails នៅ​លើ​ឧបករណ៍ %(size)s %(vendor)s %(model)s (%(device)s) ។ ទិន្នន័យ​"
 "ទាំងអស់​នៅ​លើ​ឧបករណ៍​នឹង​ត្រូវ​បាត់បង់។ បន្ត?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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:\\)"
@@ -442,7 +464,7 @@ msgstr ""
 "មិន​អាច​ប្រើ​ឯកសារ​ដែល​បាន​ជ្រើស។ អ្នក​អាច​មាន​សំណាង​ជាង បើ​អ្នក​ផ្លាស់ទី ISO ទៅ root នៃ​ដ្រាយ​របស់​"
 "អ្នក (ie: C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "បាន​ជ្រើស %(filename)s"
@@ -517,93 +539,11 @@ msgstr "ឧបករណ៍​គោលដៅ"
 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
-#, fuzzy
-msgid "Install"
-msgstr "ដំឡើង Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"ក្លូន\n"
-"&&\n"
-"ធ្វើ​បច្ចុប្បន្នភាព"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "ដំឡើង Tails"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "ធ្វើ​បច្ចុប្បន្នភាព​ពី ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/ko.po b/po/ko.po
index f6e5fda..e3392c5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: Chris Park <utopinator at gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/"
@@ -115,12 +115,12 @@ 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 "
@@ -129,151 +129,151 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "장치의 마운트를 시도 중 알 수없는 dbus 예외: %(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 ""
 
-#: ../tails_installer/creator.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"
@@ -282,18 +282,18 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -330,7 +330,7 @@ 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, "
@@ -340,33 +340,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"ISO에서 \n"
+"업그레이드"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Tails 설치"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -374,7 +386,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -383,36 +395,36 @@ 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_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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -422,34 +434,43 @@ msgstr ""
 "%(size)s%(vendor)s%(model)s장치(%(device)s)에 Tails를 설치합니다. 선택된 장"
 "치 안의 모든 데이터가 없어집니다. 계속하시겠습니까?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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:\\)"
@@ -457,7 +478,7 @@ msgstr ""
 "지정된 파일을 사용할 수 없으니 루트 디렉토리에 ISO 파일을 이동시키십시오. "
 "(예 : C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s 선택됨"
@@ -532,101 +553,26 @@ msgstr "대상 드라이브"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Tails 설치"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Tails 설치"
 
-#: ../data/tails-installer-launcher.ui.h:5
 #, fuzzy
-msgid "Upgrade"
-msgstr ""
-"ISO에서 \n"
-"업그레이드"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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
-#, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"설치\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "설치\n"
+#~ "복제해서"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"복사해서\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "복사해서\n"
+#~ "업그레이드"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"ISO에서 \n"
-"업그레이드"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/"
-"first_steps/installation.en.html\">documentation</a>"
-msgstr ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "ISO에서 \n"
+#~ "업그레이드"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/lb.po b/po/lb.po
index 2f7e368..fd25141 100644
--- a/po/lb.po
+++ b/po/lb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-06-06 20:37+0000\n"
 "Last-Translator: Tyler Durden <virii at enn.lu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/"
@@ -108,12 +108,12 @@ 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 "
@@ -122,152 +122,152 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Onbekannten dbus Exceptioun während dem unhänke vum Medium: %(message)s"
 
-#: ../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"
@@ -276,18 +276,18 @@ msgstr ""
 "Dateisystem net ënnerstëtzt: %s\n"
 "Macht 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -324,7 +324,7 @@ msgstr "Installatioun ofgeschloss! (%s)"
 msgid "Tails installation failed!"
 msgstr "Installatioun ofgeschloss!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -335,33 +335,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Upgrade\n"
+"vun ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Tails installéieren"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -369,7 +381,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -378,36 +390,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Installatioun ofgeschloss!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -418,27 +430,36 @@ msgstr ""
 "ze installéieren. All Daten op dem ausgewielte Medium gi verluer. "
 "Weiderfueren?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -446,7 +467,7 @@ 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:\\)"
@@ -454,7 +475,7 @@ 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"
@@ -529,101 +550,26 @@ msgstr "Zilmedium"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Tails installéieren"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Upgrade\n"
-"vun ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "Tails installéieren"
 
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Duerch klonen\n"
-"installéieren"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Duerch klonen\n"
+#~ "installéieren"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Upgraden\n"
-"mat klonen"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Upgraden\n"
+#~ "mat klonen"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Upgrade\n"
-"vun 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Upgrade\n"
+#~ "vun ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/lv.po b/po/lv.po
index b7e3233..d4bd386 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: Ojārs Balcers <ojars.balcers at gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/"
@@ -111,12 +111,12 @@ 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 "
@@ -125,153 +125,153 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Nezināms dbus izņēmums cenšoties montēt iekārtu: %(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 ""
 
-#: ../tails_installer/creator.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 ""
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1291 ../tails_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"
@@ -281,17 +281,17 @@ msgstr ""
 "Lū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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -327,7 +327,7 @@ msgstr "Instalēšana pabeigta! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalēšana ir pabeigta!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -338,33 +338,45 @@ msgstr ""
 "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_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Jaunināt\n"
+"no ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instalēt Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -372,7 +384,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -381,36 +393,36 @@ 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 ""
 
-#: ../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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instalēšana 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -420,27 +432,36 @@ msgstr ""
 "Tūliņ Jūs instalēsit Tails uz %(size)s %(vendor)s %(model)s ierīces "
 "(%(device)s). Uz izvēlētās ierīces pazudīs visi dati. Vai turpināt?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -448,7 +469,7 @@ 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:\\)"
@@ -456,7 +477,7 @@ 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"
@@ -531,101 +552,26 @@ msgstr "Mērķierīce"
 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-#, fuzzy
-msgid "Install"
-msgstr "Instalēt Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Jaunināt\n"
-"no ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instalēt 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instalēt\n"
-"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 ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instalēt\n"
+#~ "klonējot"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Jaunināt\n"
-"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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Jaunināt\n"
+#~ "klonējot"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Jaunināt\n"
-"no 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Jaunināt\n"
+#~ "no ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/ms.po b/po/ms.po
index 512c45f..50835cd 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: liveusb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2008-09-21 22:31+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms at lists.sourceforge.net>\n"
@@ -99,182 +99,182 @@ msgstr ""
 msgid "Cannot find device %s"
 msgstr "Jadikan Peranti RAID."
 
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, fuzzy, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Tidak dapat melekapkan peranti: %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 "Sistem fail tidak disokong: %s"
 
-#: ../tails_installer/creator.py:782
+#: ../tails_installer/creator.py:788
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Tidak dapat melekapkan peranti: %s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, fuzzy, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Tidak dapat melekapkan peranti: %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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Tidak dapat melekapkan peranti: %s"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Tidak dapat melekapkan peranti: %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
 #, fuzzy, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Tidak dapat melekapkan peranti: %s"
 
-#: ../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
 #, fuzzy
 msgid "Verifying filesystem..."
 msgstr "(Baiki sistem fail)"
 
-#: ../tails_installer/creator.py:1007
+#: ../tails_installer/creator.py:1012
 #, fuzzy, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Tidak dapat melekapkan peranti: %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 ""
 
-#: ../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
 #, fuzzy
 msgid "Unable to find any supported device"
 msgstr "Tidak dapat melekapkan peranti: %s"
 
-#: ../tails_installer/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
 #, fuzzy
 msgid "Cannot find"
 msgstr "Jadikan Peranti RAID."
 
-#: ../tails_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 "Muatturun Dipilih"
 msgid "Tails installation failed!"
 msgstr "Muatturun Dipilih"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do 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,45 +355,45 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "Muatturun Dipilih"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Muatturun Dipilih"
 
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 #, fuzzy
 msgid "Unable to mount device"
 msgstr "Tidak dapat melekapkan peranti: %s"
 
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 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,41 +401,50 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
 #, fuzzy
 msgid "Download complete!"
 msgstr "Muatturun Dipilih"
 
-#: ../tails_installer/gui.py:786
+#: ../tails_installer/gui.py:780
 #, fuzzy
 msgid "Download failed: "
 msgstr "Sambungan Gagal"
 
-#: ../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
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "Muatturun Dipilih"
@@ -501,89 +518,6 @@ msgstr ""
 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 ""
-
 #, fuzzy
 #~ msgid "LiveUSB creation failed!"
 #~ msgstr "Pelaksanaan gpg gagal (%d)\n"
diff --git a/po/nb.po b/po/nb.po
index d076a62..b53e901 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-11 18:33+0000\n"
 "Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/"
@@ -113,12 +113,12 @@ 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 "
@@ -127,151 +127,151 @@ 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"
@@ -280,17 +280,17 @@ msgstr ""
 "Filsystemet er ikke støttet: %s\n"
 "Ta 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."
@@ -324,7 +324,7 @@ 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, "
@@ -334,33 +334,41 @@ msgstr ""
 "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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../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 "
@@ -371,7 +379,7 @@ msgstr ""
 "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 "
@@ -380,35 +388,35 @@ 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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -418,27 +426,39 @@ msgstr ""
 "Du er i ferd med å installere Tails på enheten %(size)s %(vendor)s %(model)s "
 "(%(device)s). All data på den valgte enheten vil gå tapt. Vil du fortsette?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Det vedvarende lageret til en Tails-USB-minnepinne du oppgraderer er "
+"beholdt."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -446,7 +466,7 @@ 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:\\)"
@@ -454,7 +474,7 @@ 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"
@@ -533,108 +553,79 @@ msgstr "Målenhet:"
 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 ""
-"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"
+#~ msgid "Install Tails"
+#~ msgstr "Installer Tails"
 
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installer Tails på en ny USB-minnepinne."
+#~ msgid ""
+#~ "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: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."
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Installer Tails på en ny USB-minnepinne."
 
-#: ../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."
+#~ 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: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."
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/nds.po b/po/nds.po
index 98c76d8..69de1f5 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: liveusb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2010-12-03 13:56+0100\n"
 "Last-Translator: Nils-Christoph Fiedler <ncfiedler at gnome.org>\n"
 "Language-Team: Fedora Low German <nds-lowgerman at lists.sourceforge.net>\n"
@@ -112,169 +112,169 @@ msgstr "Künn voriges LiveOS nich utbinnen: %s"
 msgid "Cannot find device %s"
 msgstr "Künn Lööpwark %s nich finnen"
 
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, fuzzy, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "Künn Lööpwark nich inbinnen: %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
 #, fuzzy
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Unbekanntes Dateisystem för %s. Dat Lööpwark mutt nej formatert werrn."
 
-#: ../tails_installer/creator.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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Künn Lööpwark nich inbinnen: %s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, fuzzy, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "Künn Lööpwark nich inbinnen: %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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "Kann Gerät nicht einhängen"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "Kann Gerät nicht einhängen"
 
-#: ../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
 #, fuzzy, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Nich genug frier Spieker op'm Lööpwark."
 
-#: ../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
 #, fuzzy, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "Künn Lööpwark nich inbinnen: %s"
 
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 #, fuzzy
 msgid "Installing bootloader..."
 msgstr "Installiere 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 ""
 
-#: ../tails_installer/creator.py:1178
+#: ../tails_installer/creator.py:1183
 #, fuzzy
 msgid "Unable to find partition"
 msgstr "Künn keen LiveOS op ISO finnen"
 
-#: ../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
 #, fuzzy
 msgid "Unable to find any supported device"
 msgstr "Künn keene Wesseldatendräger finnen"
 
-#: ../tails_installer/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"
@@ -283,16 +283,16 @@ msgstr ""
 "Nich unnerstüttes Dateisystem: %s\n"
 "Bidde 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -329,40 +329,48 @@ msgstr "Daalladen avsluten!"
 msgid "Tails installation failed!"
 msgstr "Daalladen avsluten!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do 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 "
@@ -370,44 +378,44 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "Daalladen avsluten!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Daalladen avsluten!"
 
-#: ../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"
@@ -415,35 +423,44 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
 #, fuzzy
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
@@ -453,7 +470,7 @@ msgstr ""
 "Glück, wenn je dat ISO-Avbill in dat Stammverteeknis vun die'm Lööpwark "
 "verschuvst (t. B.: C:\\)."
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "ISO-Datei utwählt: %s"
@@ -528,89 +545,6 @@ msgstr "Tääll-Lööpwark"
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "Benutze vorhandene Live-CD"
diff --git a/po/nl.po b/po/nl.po
index fd60468..178ecde 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-05-06 09:40+0000\n"
 "Last-Translator: André Koot <meneer at tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
@@ -119,12 +119,12 @@ 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 "
@@ -133,158 +133,158 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Onbekende dbus-uitzondering tijdens aankoppelen van apparaat: %(message)s"
 
-#: ../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"
@@ -293,18 +293,18 @@ msgstr ""
 "Niet ondersteund bestandssysteem: %s\n"
 "Maak 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -341,7 +341,7 @@ msgstr "Installatie afgerond! (%s)"
 msgid "Tails installation failed!"
 msgstr "Installatie afgerond!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -352,33 +352,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Bijwerken\n"
+"via ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Installeer Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -386,7 +398,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -395,36 +407,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Installatie afgerond!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -435,27 +447,36 @@ msgstr ""
 "(%(device)s). Alle data op het geselecteerde apparaat zal verloren gaan. "
 "Doorgaan?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -463,7 +484,7 @@ 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:\\)"
@@ -471,7 +492,7 @@ 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"
@@ -546,101 +567,26 @@ msgstr "Doelapparaat"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Installeer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Bijwerken\n"
-"via ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Installeer 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Installeren\n"
-"via klonen"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Installeren\n"
+#~ "via klonen"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Bijwerken\n"
-"via klonen"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Bijwerken\n"
+#~ "via klonen"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Bijwerken\n"
-"via 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Bijwerken\n"
+#~ "via ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/nn.po b/po/nn.po
index 36eb174..aa69504 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-06-25 22:39+0000\n"
 "Last-Translator: Finn Brudal <finnbrudal at yahoo.com>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/"
@@ -109,12 +109,12 @@ 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 "
@@ -123,153 +123,153 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Ukjend dbus-unnatak under montering av einheiti: %(message)s"
 
-#: ../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"
@@ -278,17 +278,17 @@ msgstr ""
 "Ustøtta filsystem: %s\n"
 "Ver 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -325,7 +325,7 @@ msgstr "Installasjonen er fullført! (%s)"
 msgid "Tails installation failed!"
 msgstr "Installering fullførd"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -335,33 +335,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Uppgrader\n"
+"frå ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Installer Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -369,7 +381,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -378,36 +390,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Installering fullførd"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -418,27 +430,36 @@ msgstr ""
 "(%(device)s). Alle upplysingar på den valde einheiti vil gjenga tapt. Halda "
 "fram?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -446,7 +467,7 @@ 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:\\)"
@@ -454,7 +475,7 @@ 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)"
@@ -529,101 +550,26 @@ msgstr "Måleining"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Installer Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Installer Tails"
 
-#: ../data/tails-installer-launcher.ui.h:5
 #, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Uppgrader\n"
-"frå ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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
-#, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Installer\n"
-"ved å klona"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Installer\n"
+#~ "ved å klona"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Uppgrader\n"
-"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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Uppgrader\n"
+#~ "ved kloning"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Uppgrader\n"
-"frå 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Uppgrader\n"
+#~ "frå ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/pa.po b/po/pa.po
index cb657eb..b1d2290 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2011-01-12 16:04+0530\n"
 "Last-Translator: Jaswinder Singh <j.phulewala at gmail.com>\n"
 "Language-Team: PLTG\n"
@@ -108,167 +108,167 @@ msgstr "ਪਿਛਲਾ ਲਾਈਵ-ਓਐਸ ਹਟਾਉਣ ਲਈ ਅਸਮ
 msgid "Cannot find device %s"
 msgstr "ਜੰਤਰ %s ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, fuzzy, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "ਜੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %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
 #, fuzzy
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "%s ਲਈ ਅਣਜਾਣ ਫਾਇਲਸਿਸਟਮ। ਤੁਹਾਡੇ ਜੰਤਰ ਨੂੰ ਮੁੜ-ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
 
-#: ../tails_installer/creator.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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ਜੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, fuzzy, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "ਜੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "ਜੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "ਜੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %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
 #, fuzzy, 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
 #, fuzzy, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "ਜੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 #, fuzzy
 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
 #, fuzzy
 msgid "Unable to find partition"
 msgstr "ISO ਉੱਤੇ ਲਾਈਵ-OS ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../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
 #, fuzzy
 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"
@@ -277,17 +277,17 @@ 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
 #, fuzzy
 msgid "Cannot find"
 msgstr "ਜੰਤਰ %s ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../tails_installer/creator.py:1504
+#: ../tails_installer/creator.py:1509
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -324,40 +324,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 "
@@ -365,45 +373,45 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ!"
 
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 #, fuzzy
 msgid "Unable to mount device"
 msgstr "ਜੰਤਰ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -411,33 +419,42 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
 #, fuzzy
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
@@ -447,7 +464,7 @@ msgstr ""
 "ਕਿਸਮਤ ਚੰਗੀ ਹੋ ਸਕਦੀ ਹੈ ਜੇ ਤੁਸੀਂ ਆਪਣੇ ISO ਨੂੰ ਆਪਣੀ ਡਰਾਈਵ ਦੇ ਰੂਟ(root) ਵਿੱਚ ਲੇ ਜਾਓ (ਜਿਵੇਂ: C:"
 "\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "ISO ਚੁਣਿਆ: %s"
@@ -522,89 +539,6 @@ msgstr "ਟਾਰਗੇਟ ਜੰਤਰ"
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "ਮੌਜੂਦਾ ਲਾਈਵ ਸੀਡੀ ਵਰਤੋਂ"
diff --git a/po/pl.po b/po/pl.po
index 86cbeb2..067b023 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: sebx\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/"
@@ -119,12 +119,12 @@ msgstr ""
 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 "
@@ -133,154 +133,154 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Nieznany wyjątek dbus podczas montowania urządzenia: %(message)s"
 
-#: ../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"
@@ -289,18 +289,18 @@ msgstr ""
 "Nieobsługiwany system plików: %s\n"
 "Proszę 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -337,7 +337,7 @@ msgstr "Zakończono instalację! (%s)"
 msgid "Tails installation failed!"
 msgstr "Zakończono instalację!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -348,33 +348,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Aktualizuj \n"
+"z obrazu ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Zainstaluj Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -382,7 +394,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -391,36 +403,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Zakończono instalację!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -430,27 +442,36 @@ msgstr ""
 "Zamierzasz zainstalować Tails na %(size)s %(vendor)s %(model)s urządzenie "
 "(%(device)s). Wszystkie dane na tym nośniku zostaną utracone. Kontynuować?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -458,7 +479,7 @@ 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:\\)"
@@ -466,7 +487,7 @@ 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"
@@ -541,101 +562,26 @@ msgstr "Urządzenie docelowe"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Zainstaluj Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Aktualizuj \n"
-"z obrazu ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Zainstaluj 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Zainstaluj \n"
-"poprzez sklonowanie"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Zainstaluj \n"
+#~ "poprzez sklonowanie"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Aktualizuj \n"
-"poprzez sklonowanie"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Aktualizuj \n"
+#~ "poprzez sklonowanie"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Aktualizuj \n"
-"z obrazu 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Aktualizuj \n"
+#~ "z obrazu ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/pt.po b/po/pt.po
index e7d112e..369d448 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-04-14 14:16+0000\n"
 "Last-Translator: Manuela Silva <manuela.silva at sky.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/"
@@ -120,12 +120,12 @@ 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 "
@@ -134,157 +134,157 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Exceção dbus desconhecida enquanto tentava 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 é 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"
@@ -294,18 +294,18 @@ msgstr ""
 "Por 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -342,7 +342,7 @@ msgstr "Instalação completa! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalação completa!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -352,33 +352,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Atualizar\n"
+"a partir do ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instalar o Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -386,7 +398,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -395,36 +407,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instalação completa!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -435,27 +447,36 @@ msgstr ""
 "(%(device)s). Toda a informação do dispositivo selecionado será perdida. "
 "Deseja continuar?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -463,7 +484,7 @@ 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:\\)"
@@ -471,7 +492,7 @@ 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"
@@ -546,101 +567,26 @@ msgstr "Dispositivo de destino"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instalar o Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Atualizar\n"
-"a partir do ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instalar o 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instalar\n"
-"efetuando o clone"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instalar\n"
+#~ "efetuando o clone"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Atualizar\n"
-"efetuando o clone"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Atualizar\n"
+#~ "efetuando o clone"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Atualizar\n"
-"a partir do 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Atualizar\n"
+#~ "a partir do ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c9cea32..27e8cf4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-12-04 23:53+0000\n"
 "Last-Translator: Communia <ameaneantie at riseup.net>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/"
@@ -133,12 +133,12 @@ msgstr ""
 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 escrever 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 "
@@ -147,156 +147,156 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Exceção d-bus 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 ""
 
-#: ../tails_installer/creator.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 ""
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1291 ../tails_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"
@@ -306,18 +306,18 @@ msgstr ""
 "Por 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -354,7 +354,7 @@ msgstr "Instalação concluída! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalação concluída!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -365,33 +365,45 @@ msgstr ""
 "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/gui.py:473
+#: ../tails_installer/gui.py:454
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Atualizar \n"
+"de uma ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instalar Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -399,7 +411,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -408,36 +420,36 @@ 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 ""
 
-#: ../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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -448,27 +460,36 @@ msgstr ""
 "dispositivo (%(device)s). Todos os dados contidos no dispositivo selecionado "
 "serão perdidos. Continuar?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -476,7 +497,7 @@ 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:\\)"
@@ -485,7 +506,7 @@ msgstr ""
 "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"
@@ -560,101 +581,26 @@ msgstr "Dispositivo de destino"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instalar Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instalar Tails"
 
-#: ../data/tails-installer-launcher.ui.h:5
 #, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Atualizar \n"
-"de uma ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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
-#, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instalar\n"
-"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 ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instalar\n"
+#~ "por clonagem"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Atualizar\n"
-"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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Atualizar\n"
+#~ "por clonagem"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Atualizar \n"
-"de uma 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Atualizar \n"
+#~ "de uma ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/ro.po b/po/ro.po
index 025b4c0..7ddc0b1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: kyx <mihaidiaconu at gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/"
@@ -114,12 +114,12 @@ 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 "
@@ -128,152 +128,152 @@ msgstr ""
 "Anumite partiții ale device țintă %(device)s sînt montate. Ele vor fi "
 "demontate înainte de începerea instalării."
 
-#: ../tails_installer/creator.py:762 ../tails_installer/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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "dbus exception necunoscută cînd încercam să montez device: %(message)s"
 
-#: ../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 "Demontez filesystems montat pe '%(device)s'"
 
-#: ../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 "Încerc să continui oricum."
 
-#: ../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"
@@ -282,17 +282,17 @@ msgstr ""
 "filesystem nesuportat: %s\n"
 "Faceț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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -329,7 +329,7 @@ msgstr "Instalare completă! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalare completa!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -340,33 +340,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Actualizare\n"
+"de la ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instalez Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -374,7 +386,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -383,36 +395,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instalare completa!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -422,33 +434,42 @@ msgstr ""
 "Veți instala Tails pe %(size)s %(vendor)s %(model)s device (%(device)s). "
 "Toate datele pe deviceurile alese vor fi pierdute. Continui?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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:\\)"
@@ -456,7 +477,7 @@ 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"
@@ -531,101 +552,26 @@ msgstr "Dispozitiv țintă"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instalez Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Actualizare\n"
-"de la ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instalez 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instalare\n"
-"prin clonare"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instalare\n"
+#~ "prin clonare"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Actualizare\n"
-"prin clonare"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Actualizare\n"
+#~ "prin clonare"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Actualizare\n"
-"de la 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Actualizare\n"
+#~ "de la ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/ru.po b/po/ru.po
index 668f402..aaffa88 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-12-30 00:13+0000\n"
 "Last-Translator: Misha Dyachuk <Wikia at scryptmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/"
@@ -127,12 +127,12 @@ 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 "
@@ -141,154 +141,154 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Неизвестное исключение dbus во время монтирования устройства: %(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 ""
 
-#: ../tails_installer/creator.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 ""
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1291 ../tails_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"
@@ -298,16 +298,16 @@ msgstr ""
 "Пожалуйста, сделайте резервную копию данных и отформатируйте 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -344,7 +344,7 @@ 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, "
@@ -355,33 +355,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Обновить\n"
+"с ISO-образа"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Установить Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -389,7 +401,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -398,36 +410,36 @@ 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -437,33 +449,42 @@ msgstr ""
 "Вы собираетесь установить Tails на устройство %(size)s %(vendor)s %(model)s "
 "(%(device)s). Все данные будут потеряны. Продолжить?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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:\\)"
@@ -471,7 +492,7 @@ msgstr ""
 "Невозможно использовать указанный файл. Попробуйте переместить ISO в корень "
 "диска (например C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "Выбрано %(filename)s"
@@ -546,101 +567,26 @@ msgstr "Целевое устройство"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Установить Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Обновить\n"
-"с ISO-образа"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Установить\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Установить\n"
+#~ "клонированием"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Обновить\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Обновить\n"
+#~ "клонированием"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Обновить\n"
-"с 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Обновить\n"
+#~ "с ISO-образа"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/si_LK.po b/po/si_LK.po
index 5c53508..70e4a51 100644
--- a/po/si_LK.po
+++ b/po/si_LK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2013-06-03 05:59+0000\n"
 "Last-Translator: ganeshwaki <ganeshwaki at gmail.com>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/"
@@ -108,12 +108,12 @@ 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
 #, fuzzy, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
@@ -122,153 +122,153 @@ msgstr ""
 "USB ආම්පන්න %(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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "උපකරණය මවුන්ට් කිරීමට තැත් කිරීමේදී නොදන්නා dbus exception එකක් ඇති විය: %(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 "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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "ප්‍රති මවුන්ට් කරමින් %(device)s"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "ප්‍රති මවුන්ට් කරමින් %(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
 #, fuzzy, 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 ""
 
-#: ../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
 #, fuzzy
 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"
@@ -277,18 +277,18 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -324,7 +324,7 @@ 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, "
@@ -334,33 +334,49 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"ක්ලෝන කිරීම \n"
+"&&\n"
+"උසස් කරන්න "
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr ""
+"ක්ලෝන කිරීම \n"
+"&&\n"
+"ස්ථාපනය "
+
+#: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr ""
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -368,43 +384,43 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 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"
@@ -412,33 +428,42 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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:\\)"
@@ -446,7 +471,7 @@ msgstr ""
 "තෝරාගත් ගොනුව භාවිතා කිරීමට නොහැක.  ඔබේ ISO එක ධාවකයේ මූලය වෙත යැවීම වඩාත්  සුදුසුය."
 "(ie: C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s තෝරාගන්නා ලදී "
@@ -521,96 +546,8 @@ msgstr "ඉලක්කගත උපකරණය "
 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
-#, fuzzy
-msgid "Install"
-msgstr ""
-"ක්ලෝන කිරීම \n"
-"&&\n"
-"ස්ථාපනය "
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"ක්ලෝන කිරීම \n"
-"&&\n"
-"උසස් කරන්න "
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "ISO එකෙන් යාවත්කාලීන කරන්න"
 
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
diff --git a/po/sk.po b/po/sk.po
index d657b73..62bdd4b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2015-02-14 09:01+0000\n"
 "Last-Translator: FooBar <thewired at riseup.net>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/"
@@ -115,12 +115,12 @@ 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 "
@@ -129,153 +129,153 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Neznám dbus výnimka pri pokuse pripojiť zariadenie: %(message)s"
 
-#: ../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"
@@ -284,16 +284,16 @@ msgstr ""
 "Nepodporovaný súborový systém: %s\n"
 "Spravte 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -330,7 +330,7 @@ msgstr "Inštalácia je dokončená! (%s)"
 msgid "Tails installation failed!"
 msgstr "Inštalácia dokončená!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -341,33 +341,46 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Naklonovať\n"
+"&&\n"
+"aktualizovať"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Nainštalovať Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -375,43 +388,43 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Inštalácia dokončená!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -421,27 +434,36 @@ msgstr ""
 "Idete inštalovať Tails na %(size)s %(vendor)s %(model)s zariadení "
 "(%(device)s). Všetky dáta na vybranom zariadení budú stratené. Pokračovať?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -449,7 +471,7 @@ 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:\\)"
@@ -457,7 +479,7 @@ 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ý"
@@ -532,93 +554,11 @@ msgstr "Cieľové zariadenie"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Nainštalovať Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Naklonovať\n"
-"&&\n"
-"aktualizovať"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "Nainštalovať Tails"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Aktualizovať z 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "Aktualizovať z ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 0a98044..774248d 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-07-08 20:21+0000\n"
 "Last-Translator: Dasa M <littlearchr8 at gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/"
@@ -110,12 +110,12 @@ 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 "
@@ -124,152 +124,152 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Neznáma výnimka dbus pri snahe o pripojenie zariadenia: %(message)s"
 
-#: ../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"
@@ -278,16 +278,16 @@ msgstr ""
 "Nepodporovaný súborový systém: %s\n"
 "Prosí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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -324,7 +324,7 @@ msgstr "Inštalácia kompletná! (%s)"
 msgid "Tails installation failed!"
 msgstr "Inštalácia kompletná!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -334,33 +334,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Aktualizujem\n"
+"z ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Inštalácia Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -368,7 +380,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -377,36 +389,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Inštalácia kompletná!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -416,27 +428,36 @@ msgstr ""
 "Chystáte sa inštalovať Tails na  %(size)s %(vendor)s %(model)s zariadenie "
 "(%(device)s). Všetky dáta na vybranom zariadení budú zmazané. Pokračovať?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -444,7 +465,7 @@ 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:\\)"
@@ -452,7 +473,7 @@ 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"
@@ -527,101 +548,26 @@ msgstr "Cieľové zariadenie"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Inštalácia Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Aktualizujem\n"
-"z ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Inštalácia 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Inštalácia\n"
-"klonovaní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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Inštalácia\n"
+#~ "klonovaním"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Aktualizujem\n"
-"klonovaním"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Aktualizujem\n"
+#~ "klonovaním"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Aktualizujem\n"
-"z 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Aktualizujem\n"
+#~ "z ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index dd25fa0..373380c 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2015-10-26 16:51+0000\n"
 "Last-Translator: Tomi Bizjak <bizjaktomaz72 at gmail.com>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/otf/torproject/"
@@ -112,12 +112,12 @@ 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 "
@@ -126,152 +126,152 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Nepoznana dbus izjema pri priklapljanju naprave: %(message)s"
 
-#: ../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"
@@ -280,18 +280,18 @@ msgstr ""
 "Nepodprt datotečni sistem: %s\n"
 "Prosim 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -328,7 +328,7 @@ msgstr "Namestitev končana! (%s)"
 msgid "Tails installation failed!"
 msgstr "Namestitev končana!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -338,33 +338,46 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Kloniraj\n"
+"&&\n"
+"Nadgradi"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Namesti Sledi"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -372,7 +385,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -381,36 +394,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Namestitev končana!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -420,27 +433,36 @@ msgstr ""
 "Namestili boste Sledi na %(size)s %(vendor)s %(model)s napravo (%(device)s). "
 "Vsi podatki na izbrani napravi bodo izgubljeni. Nadaljujem?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -448,7 +470,7 @@ 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:\\)"
@@ -456,7 +478,7 @@ 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"
@@ -531,93 +553,11 @@ msgstr "Ciljna naprava"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Namesti Sledi"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Kloniraj\n"
-"&&\n"
-"Nadgradi"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "Namesti Sledi"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "Posodabljanje iz 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "Posodabljanje iz ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/sq.po b/po/sq.po
index 1112c83..389d984 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-22 16:19+0000\n"
 "Last-Translator: Bujar Tafili\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/"
@@ -112,12 +112,12 @@ 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 "
@@ -126,155 +126,155 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Përjashtim i panjohur për dbus, gjatë montimit të pajisjes: %(message)s"
 
-#: ../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"
@@ -283,17 +283,17 @@ msgstr ""
 "Sistem skedarësh i papranueshëm: %s\n"
 "Ju 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -330,7 +330,7 @@ msgstr "Instalimi u krye! (%s)"
 msgid "Tails installation failed!"
 msgstr "Instalimi u krye!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -341,33 +341,45 @@ msgstr ""
 "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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Përmirësoni\n"
+"nga ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Instaloni Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -375,7 +387,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -384,36 +396,36 @@ 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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Instalimi u krye!"
 
-#: ../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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -424,27 +436,36 @@ msgstr ""
 "%(model)s. Të gjitha të dhënat në pajisjen e përzgjedhur do të humbasin. Të "
 "vazhdojmë?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -452,7 +473,7 @@ 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:\\)"
@@ -460,7 +481,7 @@ 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"
@@ -535,101 +556,26 @@ msgstr "Pajisja e Synuar"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Instaloni Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Përmirësoni\n"
-"nga ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Instaloni 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Instaloni\n"
-"përmes klonimit"
-
-#: ../data/tails-installer-launcher.ui.h:10
-msgid ""
-"• Install Tails on another USB stick by copying the Tails system that you "
-"are currently using."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Instaloni\n"
+#~ "përmes klonimit"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Përmirësoni\n"
-"përmes klonimit"
-
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick to the same version of Tails that you are "
-"currently using."
-msgstr ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Përmirësoni\n"
+#~ "përmes klonimit"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Përmirësoni\n"
-"nga 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Përmirësoni\n"
+#~ "nga ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/sr.po b/po/sr.po
index 367fd48..393733e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: liveusb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2009-03-20 21:34+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -111,167 +111,167 @@ msgstr "Не могу да уклоним претходни живи ОС: %s"
 msgid "Cannot find device %s"
 msgstr "Не могу да пронађем уређај %s"
 
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, fuzzy, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "У немогућности да монтирам уређај: %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
 #, fuzzy
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "Непознат систем датотека за %s. Можда је уређају потребно форматирање."
 
-#: ../tails_installer/creator.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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "У немогућности да монтирам уређај: %s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, fuzzy, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "У немогућности да монтирам уређај: %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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "У немогућности да монтирам уређај: %s"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "У немогућности да монтирам уређај: %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
 #, fuzzy, 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
 #, fuzzy, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "У немогућности да монтирам уређај: %s"
 
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 #, fuzzy
 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
 #, fuzzy
 msgid "Unable to find partition"
 msgstr "Не могу да пронађем живи ОС на ISO отиску"
 
-#: ../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
 #, fuzzy
 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"
@@ -281,16 +281,16 @@ msgstr ""
 "Направите резервну копију и потом форматирајте УСБ уређај са 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -327,40 +327,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 "
@@ -368,45 +376,45 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "Преузимање завршено!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Преузимање завршено!"
 
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 #, fuzzy
 msgid "Unable to mount device"
 msgstr "У немогућности да монтирам уређај: %s"
 
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -414,33 +422,42 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
 #, fuzzy
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
@@ -450,7 +467,7 @@ msgstr ""
 "ЦД-а. Можда ћете имати више среће уколико преместите ваш ISO у корени "
 "директоријум вашег уређаја (нпр. C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "ISO је изабран: %s"
@@ -525,89 +542,6 @@ msgstr "Одредишни уређај"
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "Користи постојећи живи ЦД"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index a96d2e3..d4535f1 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: liveusb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2009-03-20 21:34+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -111,168 +111,168 @@ msgstr "Ne mogu da uklonim prethodni živi OS: %s"
 msgid "Cannot find device %s"
 msgstr "Ne mogu da pronađem uređaj %s"
 
-#: ../tails_installer/creator.py:699
+#: ../tails_installer/creator.py:701
 #, fuzzy, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "U nemogućnosti da montiram uređaj: %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
 #, fuzzy
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr ""
 "Nepoznat sistem datoteka za %s. Možda je uređaju potrebno formatiranje."
 
-#: ../tails_installer/creator.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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "U nemogućnosti da montiram uređaj: %s"
 
-#: ../tails_installer/creator.py:786
+#: ../tails_installer/creator.py:792
 #, fuzzy, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "U nemogućnosti da montiram uređaj: %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
 #, fuzzy, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "U nemogućnosti da montiram uređaj: %s"
 
-#: ../tails_installer/creator.py:816
+#: ../tails_installer/creator.py:822
 #, fuzzy, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "U nemogućnosti da montiram uređaj: %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
 #, fuzzy, python-format
 msgid "Partitioning device %(device)s"
 msgstr "Nedovoljno slobodnog prostora na uređaju."
 
-#: ../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
 #, fuzzy, python-format
 msgid "Unable to change volume label: %(message)s"
 msgstr "U nemogućnosti da montiram uređaj: %s"
 
-#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409
+#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414
 #, fuzzy
 msgid "Installing bootloader..."
 msgstr "Instaliram pokretački program"
 
-#: ../tails_installer/creator.py:1038
+#: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
 msgstr ""
 
-#: ../tails_installer/creator.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
 #, fuzzy
 msgid "Unable to find partition"
 msgstr "Ne mogu da pronađem živi OS na ISO otisku"
 
-#: ../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
 #, fuzzy
 msgid "Unable to find any supported device"
 msgstr "Ne mogu da pronađem nijedan prenosivi 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 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"
@@ -282,16 +282,16 @@ msgstr ""
 "Napravite 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -328,40 +328,48 @@ msgstr "Preuzimanje završeno!"
 msgid "Tails installation failed!"
 msgstr "Preuzimanje završeno!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do 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 "
@@ -369,45 +377,45 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 msgid "Installation complete!"
 msgstr "Preuzimanje završeno!"
 
-#: ../tails_installer/gui.py:652
+#: ../tails_installer/gui.py:644
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Preuzimanje završeno!"
 
-#: ../tails_installer/gui.py:701
+#: ../tails_installer/gui.py:693
 #, fuzzy
 msgid "Unable to mount device"
 msgstr "U nemogućnosti da montiram uređaj: %s"
 
-#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736
+#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730
 msgid "Confirm the target USB stick"
 msgstr ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -415,33 +423,42 @@ msgid ""
 "All data on this USB stick will be lost."
 msgstr ""
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr ""
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
 #, fuzzy
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
@@ -451,7 +468,7 @@ msgstr ""
 "CD-a. Možda ćete imati više sreće ukoliko premestite vaš ISO u koreni "
 "direktorijum vašeg uređaja (npr. C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, fuzzy, python-format
 msgid "%(filename)s selected"
 msgstr "ISO je izabran: %s"
@@ -526,89 +543,6 @@ msgstr "Odredišni uređaj"
 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 ""
-
 #, fuzzy
 #~ msgid "Use existing Live system ISO:"
 #~ msgstr "Koristi postojeći živi CD"
diff --git a/po/sv.po b/po/sv.po
index da99dd0..a590162 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-16 09:42+0000\n"
 "Last-Translator: Anders Nilsson <anders at devode.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/"
@@ -117,12 +117,12 @@ 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 "
@@ -131,152 +131,152 @@ 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"
@@ -285,16 +285,16 @@ msgstr ""
 "Ej stött filsystem: %s\n"
 "Gö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."
@@ -329,7 +329,7 @@ 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, "
@@ -339,33 +339,41 @@ msgstr ""
 "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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails 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 "
@@ -376,7 +384,7 @@ msgstr ""
 "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 "
@@ -385,35 +393,35 @@ 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -424,27 +432,39 @@ msgstr ""
 "(%(device)s). All data på den valda enheten kommer att gå förlorad. Vill du "
 "fortsätta?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Den krypterade beständiga lagringen på Tails-USB-minnet som du uppgraderar "
+"kommer att behållas."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -452,7 +472,7 @@ 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:\\)"
@@ -460,7 +480,7 @@ 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"
@@ -539,106 +559,79 @@ msgstr "Målenhet:"
 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"
+#~ msgid "Install Tails"
+#~ msgstr "Installera Tails"
 
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr "• Installerar Tails på ett nytt USB-minne."
+#~ msgid ""
+#~ "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: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."
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Installerar Tails på ett nytt USB-minne."
 
-#: ../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."
+#~ 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: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."
+#~ 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: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>"
+#~ 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"
+#~ 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."
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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"
+#~ 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."
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/tails-installer.pot b/po/tails-installer.pot
index 6ae174b..9332279 100644
--- a/po/tails-installer.pot
+++ b/po/tails-installer.pot
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../tails_installer/creator.py:101
@@ -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/po/th.po b/po/th.po
index f0105fb..3ad176f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2015-02-20 12:21+0000\n"
 "Last-Translator: Somchai Sirisakdipol <mishari at mishari.net>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/"
@@ -113,163 +113,163 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ไม่ทราบการยกเว้น dbus ขณะพยายามใส่อุปกรณ์ %(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 สำหรับ '%(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"
@@ -278,16 +278,16 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -320,7 +320,7 @@ 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, "
@@ -329,33 +329,46 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"โคลน\n"
+"&&\n"
+"ปรับรุ่น"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "ลง Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -363,43 +376,43 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -409,39 +422,48 @@ msgstr ""
 "จะลง Tails  บน %(size)s %(vendor)s %(model)s อุปกรณ์ (%(device)s) "
 "ข้อมูลทั้งหมดในอุปกรณ์นี้จะหายไป ให้ดำเนินการหรือไม่?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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 ถูกเลือก"
@@ -516,93 +538,11 @@ msgstr " อุปกรณ์เป้าหมาย"
 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
-#, fuzzy
-msgid "Install"
-msgstr "ลง Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"โคลน\n"
-"&&\n"
-"ปรับรุ่น"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is 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 ""
+#~ msgid "Install Tails"
+#~ msgstr "ลง Tails"
 
-#: ../data/tails-installer-launcher.ui.h:13
-msgid ""
-"• Upgrade another Tails USB stick 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr "ปรับรุ่นจาก ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/tr.po b/po/tr.po
index 43bbfd7..ea68263 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-20 14:25+0000\n"
 "Last-Translator: Volkan Gezer <volkangezer at gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/"
@@ -121,12 +121,12 @@ 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 "
@@ -135,155 +135,155 @@ msgstr ""
 "%(device)s hedef aygıtının bazı bölümleri takılmış. Bu bölümler yükleme "
 "işlemi başlamadan önce çaı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 bağlanmaya çalışılırken bilinmeyen Glib istisnası: %(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 çıkartılan 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 çıkartılan 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"
@@ -292,17 +292,17 @@ msgstr ""
 "Dosya sistemi desteklenmiyor: %s\n"
 "Lü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."
@@ -337,7 +337,7 @@ msgstr "Yükleme tamamlandı! (%s)"
 msgid "Tails installation failed!"
 msgstr "Tails kurulumu başarısız!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -347,33 +347,41 @@ msgstr ""
 "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 "Güncelle"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+msgid "Install"
+msgstr "Yükle"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr "Tails kurulumu için uygun 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 veya 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 "
@@ -384,7 +392,7 @@ msgstr ""
 "yapılandırılmış ve Tails bunun üzeriinde 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 "
@@ -393,35 +401,35 @@ 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 yüklenirken bir hata oluştu"
 
-#: ../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 ""
 
-#: ../tails_installer/gui.py:709
+#: ../tails_installer/gui.py:701
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -431,27 +439,39 @@ msgstr ""
 "Tails'i %(size)s %(vendor)s %(model)s aygıtı (%(device)s) üzerine yüklemek "
 "üzeresiniz. Seçilen aygıttaki tüm veri kaybedilecek. Devam edilsin mi?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr ""
+"• Yükseltme yaptığınız Tails USB belleğindeki şifreli kalıcı depolama "
+"korunacak."
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -459,7 +479,7 @@ 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:\\)"
@@ -467,7 +487,7 @@ 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"
@@ -546,105 +566,76 @@ msgstr "Hedef Aygıt:"
 msgid "Reinstall (delete all data)"
 msgstr ""
 
-#: ../data/tails-installer.ui.h:7
-msgid "Install Tails"
-msgstr "Tails Yazılımını Yükle"
+#~ 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ına ihtiyacınız var: <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', bir USB bellek üzerine yükle"
-
-#: ../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."
+#~ msgid ""
+#~ "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ına ihtiyacınız var: <a href=\"https://tails.boum.org/"
+#~ "download/\">https://tails.boum.org/download/</a>"
 
-#: ../data/tails-installer-launcher.ui.h:5
-msgid "Upgrade"
-msgstr "Güncelle"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "• Tails', bir USB bellek üzerine yükle"
 
-#: ../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ükselt."
+#~ 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: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."
+#~ 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ükselt."
 
-#: ../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/\">Belgelendirmeyi</a> okuyun"
+#~ 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/\">Belgelendirmeyi</a> okuyun"
 
-#: ../data/tails-installer-launcher.ui.h:9
-msgid "Install by cloning"
-msgstr "Klonlayarak yükle"
+#~ msgid "Install by cloning"
+#~ msgstr "Klonlayarak 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 ""
-"• Halihazırda kullandığınız Tails sistemini kopyalayarak Tails'i başka bir "
-"USB belleğe yükle."
+#~ msgid ""
+#~ "• Install Tails on another USB stick by copying the Tails system that you "
+#~ "are currently using."
+#~ msgstr ""
+#~ "• Halihazırda kullandığınız Tails sistemini kopyalayarak Tails'i başka "
+#~ "bir USB belleğe yükle."
 
-#: ../data/tails-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."
+#~ 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 "Klonlayarak yükselt"
+#~ msgid "Upgrade by cloning"
+#~ msgstr "Klonlayarak 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 ""
-"• Diğer bir Tails USB belleğini şu an kullandığınız Tails ile aynı sürümüne "
-"yükseltin."
+#~ msgid ""
+#~ "• Upgrade another Tails USB stick to the same version of Tails that you "
+#~ "are currently using."
+#~ msgstr ""
+#~ "• Diğer bir Tails USB belleğini şu an kullandığınız Tails ile aynı "
+#~ "sürümüne yükseltin."
 
-#: ../data/tails-installer-launcher.ui.h:14
-msgid "Upgrade from ISO"
-msgstr "ISO'dan yükselt"
+#~ msgid "Upgrade from ISO"
+#~ msgstr "ISO'dan 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."
+#~ 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\">Belgelendirmeyi</a> okuyun"
+#~ 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\">Belgelendirmeyi</a> okuyun"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/uk.po b/po/uk.po
index 1e49d13..1c0bff2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-03-21 16:31+0000\n"
 "Last-Translator: Vira Motorko <ato4ka at i.ua>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/"
@@ -114,12 +114,12 @@ 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 "
@@ -128,152 +128,152 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "Невідомий виняток dbus під час монтування пристрою: %(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 ""
 
-#: ../tails_installer/creator.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"
@@ -283,16 +283,16 @@ msgstr ""
 "Зробіть резервну копію даних та відформатуйте 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -329,7 +329,7 @@ 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, "
@@ -340,33 +340,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Оновити\n"
+"з ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Встановити Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -374,7 +386,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -383,36 +395,36 @@ 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -422,33 +434,42 @@ msgstr ""
 "Ви збираєтеся встановити Tails на пристрій %(size)s %(vendor)s %(model)s "
 "(%(device)s). Всі дані будуть втрачені. Продовжити?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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:\\)"
@@ -456,7 +477,7 @@ msgstr ""
 "Неможливо використовувати вказаний файл. Спробуйте перемістити ISO в корінь "
 "диска (наприклад, C:\\)"
 
-#: ../tails_installer/gui.py:807
+#: ../tails_installer/gui.py:801
 #, python-format
 msgid "%(filename)s selected"
 msgstr "%(filename)s обрано"
@@ -531,101 +552,26 @@ msgstr "Цільовий пристрій"
 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
-#, fuzzy
-msgid "Install"
-msgstr "Встановити Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Оновити\n"
-"з ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Встановити\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Встановити\n"
+#~ "через клонування"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Оновити\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Оновити\n"
+#~ "через клонування"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Оновити\n"
-"з 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Оновити\n"
+#~ "з ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/vi.po b/po/vi.po
index b85556f..28642fb 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-10-03 04:23+0000\n"
 "Last-Translator: Khanh Nguyen <nguyenduykhanh85 at gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/"
@@ -111,12 +111,12 @@ 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 "
@@ -125,153 +125,153 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 "Có sự loại dbus không xác định trong khi đang gắn 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 ""
 
-#: ../tails_installer/creator.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 ""
 
-#: ../tails_installer/creator.py:1274
+#: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1278
+#: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:1291 ../tails_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"
@@ -281,18 +281,18 @@ msgstr ""
 "Vui 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -329,7 +329,7 @@ msgstr "Cài đặt hoàn tất! (%s)"
 msgid "Tails installation failed!"
 msgstr "Cài đặt hoàn tất!"
 
-#: ../tails_installer/gui.py:364
+#: ../tails_installer/gui.py:363
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
@@ -339,33 +339,45 @@ msgstr ""
 "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 ""
 
-#: ../tails_installer/gui.py:473
+#: ../tails_installer/gui.py:454
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"Nâng cấp\n"
+"từ ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "Cài đặt Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -373,7 +385,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -382,36 +394,36 @@ 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 ""
 
-#: ../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
 #, fuzzy
 msgid "Installation was completed."
 msgstr "Cài đặt 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -421,27 +433,36 @@ msgstr ""
 "Bạn đang cài đặt Tails trên %(size)s %(vendor)s %(model)s thiết bị\n"
 "(%(device)s). Tất cả dữ liệu trên thiết bị sẽ bị xóa. Bạn muốn tiếp tục?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:782
+#: ../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."
@@ -449,7 +470,7 @@ 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:\\)"
@@ -457,7 +478,7 @@ 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"
@@ -532,101 +553,26 @@ msgstr "Thiết bị đích"
 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:2
-#, fuzzy
-msgid "Install"
-msgstr "Cài đặt Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"Nâng cấp\n"
-"từ ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ msgstr "Cài đặt 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"Cài đặt\n"
-"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 ""
-
-#: ../data/tails-installer-launcher.ui.h:11
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you are "
-"currently using is not copied."
-msgstr ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "Cài đặt\n"
+#~ "bằng cách nhân bản"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"Nâng cấp\n"
-"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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "Nâng cấp\n"
+#~ "bằng cách nhân bản"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"Nâng cấp\n"
-"từ 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "Nâng cấp\n"
+#~ "từ ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 76b3260..18c532e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-03-16 00:51+0000\n"
 "Last-Translator: Chi-Hsun Tsai <chihsun.tsai at gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/"
@@ -121,163 +121,163 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "尝试挂载设备时发生未知 dbus 异常: %(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 ""
 
-#: ../tails_installer/creator.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 的 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"
@@ -286,16 +286,16 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -328,7 +328,7 @@ 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, "
@@ -337,33 +337,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"升级\n"
+"从 ISO"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "安装Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -371,7 +383,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -379,36 +391,36 @@ msgid ""
 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -418,39 +430,48 @@ msgstr ""
 "您将在%(size)s %(vendor)s %(model)s 磁盘 (%(device)s)安装Tails。在您选择的磁"
 "盘上的所有数据将会丢失。是否继续?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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 已选取"
@@ -525,101 +546,26 @@ msgstr "目前设备"
 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
-#, fuzzy
-msgid "Install"
-msgstr "安装Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"升级\n"
-"从 ISO"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"安装\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "安装\n"
+#~ "通过克隆"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"升级\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "升级\n"
+#~ "通过克隆"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"升级\n"
-"从 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 ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "升级\n"
+#~ "从 ISO"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8cb8a80..f94f261 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2016-04-17 07:49+0000\n"
 "Last-Translator: 大圈洋蔥\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/"
@@ -116,163 +116,163 @@ 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
 #, fuzzy, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "掛接裝置時發生未知嘅dbus例外:%(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 ""
 
-#: ../tails_installer/creator.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的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"
@@ -281,16 +281,16 @@ 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
 #, fuzzy
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this "
@@ -323,7 +323,7 @@ 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, "
@@ -332,33 +332,45 @@ 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
+#, fuzzy
+msgid "Upgrade"
+msgstr ""
+"從ISO\n"
+"升級"
+
+#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
+#, fuzzy
+msgid "Install"
+msgstr "安裝Tails"
+
+#: ../tails_installer/gui.py:465
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
 msgstr ""
 
-#: ../tails_installer/gui.py:524
+#: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
 msgstr ""
 
-#: ../tails_installer/gui.py:526
+#: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
 msgstr ""
 
-#: ../tails_installer/gui.py:560
+#: ../tails_installer/gui.py:552
 #, python-format
 msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
@@ -366,7 +378,7 @@ msgid ""
 "different model."
 msgstr ""
 
-#: ../tails_installer/gui.py:570
+#: ../tails_installer/gui.py:562
 #, python-format
 msgid ""
 "The device \"%(pretty_name)s\" is too small to install Tails (at least "
@@ -374,36 +386,36 @@ msgid ""
 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
 #, fuzzy
 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -413,40 +425,49 @@ msgstr ""
 "即將安裝Tails於%(size)s %(vendor)s %(model)s裝置(%(device)s)。全部喺所選裝置"
 "上嘅資料將會消失。繼續?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
 msgid ""
-"%(vendor)s %(model)s 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
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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"
@@ -521,101 +542,26 @@ msgstr "目標裝置"
 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
-#, fuzzy
-msgid "Install"
-msgstr "安裝Tails"
-
-#: ../data/tails-installer-launcher.ui.h:3
-msgid "• Install Tails on a new USB stick."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:4
-msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:5
-#, fuzzy
-msgid "Upgrade"
-msgstr ""
-"從ISO\n"
-"升級"
-
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr ""
+#~ msgid "Install Tails"
+#~ 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 ""
-
-#: ../data/tails-installer-launcher.ui.h:9
 #, fuzzy
-msgid "Install by cloning"
-msgstr ""
-"通過複製文件\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 ""
+#~ msgid "Install by cloning"
+#~ msgstr ""
+#~ "通過複製文件\n"
+#~ "安裝"
 
-#: ../data/tails-installer-launcher.ui.h:12
 #, fuzzy
-msgid "Upgrade by cloning"
-msgstr ""
-"通過複製文件\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 ""
+#~ msgid "Upgrade by cloning"
+#~ msgstr ""
+#~ "通過複製文件\n"
+#~ "升級"
 
-#: ../data/tails-installer-launcher.ui.h:14
 #, fuzzy
-msgid "Upgrade from ISO"
-msgstr ""
-"從ISO\n"
-"升級"
-
-#: ../data/tails-installer-launcher.ui.h:15
-msgid "• Upgrade another Tails USB stick to the version of an ISO image."
-msgstr ""
-
-#: ../data/tails-installer-launcher.ui.h:16
-msgid ""
-"Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/"
-"first_steps/installation.en.html\">documentation</a>"
-msgstr ""
+#~ msgid "Upgrade from ISO"
+#~ msgstr ""
+#~ "從ISO\n"
+#~ "升級"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c492f30..aeeddb2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:52+0200\n"
+"POT-Creation-Date: 2017-09-20 18:02+0200\n"
 "PO-Revision-Date: 2017-06-18 01:31+0000\n"
 "Last-Translator: Agustín Wu <losangwuyts at gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/"
@@ -121,12 +121,12 @@ 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 "
@@ -134,151 +134,151 @@ msgid ""
 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"
@@ -287,16 +287,16 @@ 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."
@@ -327,7 +327,7 @@ 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, "
@@ -336,33 +336,41 @@ 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
 #, fuzzy, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
 msgstr ""
 
-#: ../tails_installer/gui.py:485
+#: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO 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 "
@@ -372,7 +380,7 @@ 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 "
@@ -381,35 +389,35 @@ 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
 #, fuzzy, python-format
 msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
@@ -419,40 +427,50 @@ msgstr ""
 "您即將在 %(size)s %(vendor)s %(model)s 裝置 (%(device)s)上安裝 Tails ,被選取"
 "裝置上的資料都將會消失,確定要繼續嗎?"
 
-#: ../tails_installer/gui.py:728
+#: ../tails_installer/gui.py:717
 #, fuzzy, python-format
+msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+
+#: ../tails_installer/gui.py:725
+#, fuzzy
 msgid ""
-"%(vendor)s %(model)s device (%(device)s)\n"
 "\n"
-"%(persistence_message)s"
+"\n"
+"The persistent storage on this USB stick will be preserved."
+msgstr "‧裝有 Tails 系統的加密式永久儲存裝置已經被保存。"
+
+#: ../tails_installer/gui.py:726
+#, fuzzy, python-format
+msgid "%(description)s%(persistence_message)s"
 msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
-#: ../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 已選取"
@@ -531,94 +549,67 @@ msgstr "目標裝置:"
 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>"
+#~ msgid "Install Tails"
+#~ msgstr "安裝 Tails"
 
-#: ../data/tails-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 隨身碟已被格式化,裡面的資料已經全部消失。"
+#~ msgid ""
+#~ "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:5
-msgid "Upgrade"
-msgstr "升級"
+#~ msgid "• Install Tails on a new USB stick."
+#~ msgstr "‧將 Tails 系統安裝在一個新的 USB 隨身碟中。"
 
-#: ../data/tails-installer-launcher.ui.h:6
-msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr "‧將隨身碟中的 Tails 系統版本升級到與 ISO 影像檔相同。"
+#~ msgid ""
+#~ "• The USB stick that you install on is formatted and all data is lost."
+#~ msgstr "‧您所選擇要安裝的 USB 隨身碟已被格式化,裡面的資料已經全部消失。"
 
-#: ../data/tails-installer-launcher.ui.h:7
-msgid ""
-"• The encrypted persistent storage of the Tails USB stick that you upgrade "
-"is preserved."
-msgstr "‧裝有 Tails 系統的加密式永久儲存裝置已經被保存。"
+#~ msgid "• Upgrade a Tails USB stick to the version of an ISO image."
+#~ msgstr "‧將隨身碟中的 Tails 系統版本升級到與 ISO 影像檔相同。"
 
-#: ../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>"
+#~ 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 "複製式安裝"
+#~ msgid "Install by cloning"
+#~ msgstr "複製式安裝"
 
-#: ../data/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 隨身碟中。"
+#~ 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 隨身碟並未被複製。"
+#~ 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 "複製式升級"
+#~ msgid "Upgrade by cloning"
+#~ msgstr "複製式升級"
 
-#: ../data/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 系統升級至與目前您正使用版本相同。"
+#~ 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 影像檔升級"
+#~ 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 影像檔相同。"
+#~ 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>"
+#~ 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>"
 
 #~ msgid "%(size)s %(label)s"
 #~ msgstr "%(size)s %(label)s"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git



More information about the Pkg-privacy-commits mailing list