Skip to content

Commit

Permalink
Refine the wording of the entry of full disk encryption during instal…
Browse files Browse the repository at this point in the history
…lation
  • Loading branch information
Alex Tu committed Sep 20, 2019
1 parent 1e722b3 commit f293a05
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 4 deletions.
8 changes: 6 additions & 2 deletions debian/dell-recovery.templates
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,15 @@ _Description: WARNING: All personal files and changes will be lost.

Template: ubiquity/text/interactive_recovery
Type: text
_Description: Restore only Linux OS partition.
_Description: Customize installation.

Template: ubiquity/text/interactive_info
Type: text
_Description: This option allows you to resize any existing partitions.
_Description: e.g. Disk encryption, partitions resizing..etc.

Template: ubiquity/text/nonrecovery_warning_label
Type: text
_Description: WARNING: No recovery feature included.

Template: ubiquity/text/genuine_bootstrap_warning_label
Type: text
Expand Down
28 changes: 26 additions & 2 deletions ubiquity/stepDellBootstrap.ui
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@
<property name="spacing">5</property>
<child>
<object class="GtkRadioButton" id="interactive_recovery">
<property name="label" translatable="yes">Restore only Linux OS partition.</property>
<property name="label" translatable="yes">Customize installation.</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Expand Down Expand Up @@ -544,7 +544,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">This option allows you to resize any existing partitions.</property>
<property name="label" translatable="yes">e.g. Disk encryption, partitions resizing..etc.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
Expand All @@ -556,6 +556,30 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">25</property>
<child>
<object class="GtkLabel" id="nonrecovery_warning_label">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">WARNING: No recovery feature included.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
Expand Down

0 comments on commit f293a05

Please sign in to comment.