Run make gui.feature/9672-rework-installer-wording-on-wheezy

3 files changed, 7 insertions, 15 deletions

diff --git a/liveusb/dialog.py b/liveusb/dialog.py
index 177c621..805563e 100644
--- a/liveusb/dialog.py
+++ b/liveusb/dialog.py
@@ -2,8 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/liveusb-creator.ui'
 #
-# Created: Fri Jul  3 18:52:08 2015
-#      by: PyQt4 UI code generator 4.11.2
+# Created by: PyQt4 UI code generator 4.11.4
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -50,15 +49,14 @@ class Ui_Dialog(object):
         self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
         self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget)
         self.verticalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
-        self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
         self.titleLabel = QtGui.QLabel(self.layoutWidget)
         self.titleLabel.setText(_fromUtf8(""))
         self.titleLabel.setObjectName(_fromUtf8("titleLabel"))
         self.verticalLayout.addWidget(self.titleLabel)
         self.sourceHorizontalLayout = QtGui.QHBoxLayout()
-        self.sourceHorizontalLayout.setSpacing(6)
         self.sourceHorizontalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
+        self.sourceHorizontalLayout.setSpacing(6)
         self.sourceHorizontalLayout.setObjectName(_fromUtf8("sourceHorizontalLayout"))
         self.sourceFileGroupBox = QtGui.QGroupBox(self.layoutWidget)
         self.sourceFileGroupBox.setMinimumSize(QtCore.QSize(161, 61))
diff --git a/liveusb/launcher_ui.py b/liveusb/launcher_ui.py
index b339d05..115da5c 100644
--- a/liveusb/launcher_ui.py
+++ b/liveusb/launcher_ui.py
@@ -2,8 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/liveusb-creator-launcher.ui'
 #
-# Created: Fri Jul  3 18:52:08 2015
-#      by: PyQt4 UI code generator 4.11.2
+# Created by: PyQt4 UI code generator 4.11.4
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -80,7 +79,6 @@ class Ui_Dialog(object):
         self.cloneInstallLabel.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.cloneInstallLabel.setBaseSize(QtCore.QSize(300, 96))
         self.cloneInstallLabel.setWordWrap(True)
-        self.cloneInstallLabel.setMargin(6)
         self.cloneInstallLabel.setObjectName(_fromUtf8("cloneInstallLabel"))
         self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.cloneInstallLabel)
         self.cloneUpgradeButton = QtGui.QPushButton(Dialog)
@@ -110,7 +108,6 @@ class Ui_Dialog(object):
         self.upgradeFromIsoLabel.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.upgradeFromIsoLabel.setBaseSize(QtCore.QSize(300, 96))
         self.upgradeFromIsoLabel.setWordWrap(True)
-        self.upgradeFromIsoLabel.setMargin(6)
         self.upgradeFromIsoLabel.setObjectName(_fromUtf8("upgradeFromIsoLabel"))
         self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.upgradeFromIsoLabel)
         self.upgradeFromIsoButton = QtGui.QPushButton(Dialog)
@@ -139,12 +136,10 @@ class Ui_Dialog(object):
         self.cloneUpgradeLabel.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.cloneUpgradeLabel.setBaseSize(QtCore.QSize(300, 96))
         self.cloneUpgradeLabel.setWordWrap(True)
-        self.cloneUpgradeLabel.setMargin(6)
         self.cloneUpgradeLabel.setObjectName(_fromUtf8("cloneUpgradeLabel"))
         self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.cloneUpgradeLabel)
         self.gridLayout.addLayout(self.formLayout, 0, 0, 1, 1)
         self.helpLabel = QtGui.QLabel(Dialog)
-        self.helpLabel.setMargin(6)
         self.helpLabel.setObjectName(_fromUtf8("helpLabel"))
         self.gridLayout.addWidget(self.helpLabel, 1, 0, 1, 1)
         self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
@@ -157,11 +152,11 @@ class Ui_Dialog(object):
     def retranslateUi(self, Dialog):
         Dialog.setWindowTitle(translate_and_brand('%(distribution)s Installer'))
         self.cloneInstallButton.setText(translate_and_brand('Install\nby cloning'))
-        self.cloneInstallLabel.setText(translate_and_brand('<ul>\n<li>Install Tails on another removable device by copying the Tails system that you are currently using.</li>\n\n<li>The removable device that you install on is formatted and all data is lost.</li>\n\n<li>The encrypted persistent storage of the Tails device that you are currently using is not copied.</li>\n\n</ul>'))
+        self.cloneInstallLabel.setText(translate_and_brand('<ul>\n<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n\n<li>The USB stick that you install on is formatted and all data is lost.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n\n</ul>'))
         self.cloneUpgradeButton.setText(translate_and_brand('Upgrade\nby cloning'))
-        self.upgradeFromIsoLabel.setText(translate_and_brand('<ul>\n<li>Upgrade another Tails device to the same version of Tails that you are currently using.</li>\n\n<li>The encrypted persistent storage of the Tails device that you upgrade is preserved.</li>\n\n<li>The encrypted persistent storage of the Tails device that you are currently using is not copied.</li>\n\n\n</ul>'))
+        self.upgradeFromIsoLabel.setText(translate_and_brand('<ul>\n<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n\n\n</ul>'))
         self.upgradeFromIsoButton.setText(translate_and_brand('Upgrade\nfrom ISO'))
-        self.cloneUpgradeLabel.setText(translate_and_brand('<ul>\n<li>Upgrade another Tails device to the version of an ISO image.</li>\n\n<li>The encrypted persistent storage of the Tails device that you upgrade is preserved.</li>\n\n<li>The encrypted persistent storage of the Tails device that you are currently using is not copied.</li>\n\n</ul>'))
+        self.cloneUpgradeLabel.setText(translate_and_brand('<ul>\n<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n\n</ul>'))
         self.helpLabel.setText(translate_and_brand('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">\n<html><head><meta name="qrichtext" content="1" /><style type="text/css">\np, li { white-space: pre-wrap; }\n</style></head><body style=" font-family:\'Cantarell\'; font-size:11pt; font-weight:400; font-style:normal;">\n<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Need help? Read the <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html"><span style=" text-decoration: underline; color:#0000ff;">documentation</span></a>.</p></body></html>'))
 
 import resources_rc
diff --git a/liveusb/resources_rc.py b/liveusb/resources_rc.py
index 070e670..6ed358a 100755
--- a/liveusb/resources_rc.py
+++ b/liveusb/resources_rc.py
@@ -2,8 +2,7 @@
 
 # Resource object code
 #
-# Created: Fr. Jul 3 18:52:08 2015
-#      by: The Resource Compiler for PyQt (Qt v4.8.6)
+# Created by: The Resource Compiler for PyQt4 (Qt v4.8.7)
 #
 # WARNING! All changes made in this file will be lost!