[Pkg-privacy-commits] [tails-installer] 35/70: Feature 9005: Add help link and change some labels text.

[Ulrike Uhlig]

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 6842a6d9fc507c30b254fba52a86987b913f2984
Author: Tails Developers <tails at boum.org>
Date:   Tue Aug 23 10:50:05 2016 +0200

    Feature 9005: Add help link and change some labels text.
---
 data/tails-installer.ui | 32 +++++++++++++++++++++++---------
 tails_installer/gui.py  |  2 +-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/data/tails-installer.ui b/data/tails-installer.ui
index 7301fe1..9a3095d 100644
--- a/data/tails-installer.ui
+++ b/data/tails-installer.ui
@@ -124,6 +124,20 @@
       </packing>
     </child>
     <child>
+      <object class="GtkLinkButton" id="help_install_link">
+        <property name="label" translatable="yes">Installation Instructions</property>
+        <property name="visible">True</property>
+        <property name="margin_right">18</property>
+        <property name="xalign">1</property>
+        <property name="uri">https://tails.boum.org/install/index.en.html</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+     </packing>
+    </child>
+    <child>
       <object class="GtkBox" id="box_source">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -162,7 +176,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="radio_button_source_iso">
-                    <property name="label" translatable="yes">Use existing Live system ISO</property>
+                    <property name="label" translatable="yes">Use downloaded Tails ISO image</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
@@ -248,7 +262,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="position">3</property>
       </packing>
     </child>
     <child>
@@ -294,7 +308,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="position">4</property>
       </packing>
     </child>
     <child>
@@ -322,7 +336,7 @@
       <packing>
         <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">4</property>
+        <property name="position">5</property>
       </packing>
     </child>
     <child>
@@ -336,25 +350,25 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">5</property>
+        <property name="position">6</property>
       </packing>
     </child>
     <child>
       <object class="GtkLinkButton" id="check_force_reinstall">
-        <property name="label" translatable="yes">Force reinstall</property>
+        <property name="label" translatable="yes">Erase & Reinstall</property>
         <property name="visible">False</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="margin_left">18</property>
         <property name="margin_right">18</property>
         <property name="margin_bottom">18</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
         <signal name="clicked" handler="on_force_reinstall_clicked" swapped="no"/>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">6</property>
+        <property name="position">7</property>
      </packing>
     </child>
     <child>
@@ -373,7 +387,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">7</property>
+        <property name="position">8</property>
       </packing>
     </child>
   </object>
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index 54a37e2..b895d49 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -423,7 +423,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
             self.opts.clone = True
             #self.__box_source_file.set_visible(False)
             self.__filechooserbutton_source_file.set_sensitive(False)
-        elif active_radio.get_label() == "Use existing Live system ISO":
+        elif active_radio.get_label() == "Use downloaded Tails ISO image":
             self.opts.clone = False
             self.__filechooserbutton_source_file.set_sensitive(False)
 

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