ubiquity

Merge lp:~jbicha/ubiquity/use-RELEASE-instead-of-Ubuntu-more into lp:ubiquity

  1. use-RELEASE-instead-of-Ubuntu-more
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Rejected
Rejected by: Colin Watson
Proposed branch: lp:~jbicha/ubiquity/use-RELEASE-instead-of-Ubuntu-more
Merge into: lp:ubiquity
Diff against target: 39 lines (+4/-4)
1 file modified
debian/ubiquity.templates (+4/-4)
To merge this branch: bzr merge lp:~jbicha/ubiquity/use-RELEASE-instead-of-Ubuntu-more
Reviewer Review Type Date Requested Status
Colin Watson (community) Disapprove
Huan Peng (community) Needs Fixing
Review via email: mp+171000@code.launchpad.net

Description of the change

This should make the "Installation type" screen a bit more consistent for Ubuntu flavors.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

OK as far as it goes, but I believe that as it stands this will literally show "${RELEASE}" in the UI; you also need to modify the code that's fetching these strings to substitute in appropriate text.

review: Needs Fixing
Revision history for this message
Huan Peng (penghuanmail) wrote :

Yes, i have confirm that, if you only modify the ubiquity.templates file, it literally show "${RELEASE}" in the UI

review: Needs Fixing
Revision history for this message
Colin Watson (cjwatson) wrote :

Superseded by lp:~penghuanmail/ubiquity/lp.1197220.

review: Disapprove

Unmerged revisions

5944. By Jeremy Bícha

Use ${RELEASE} instead of Ubuntu in a few more places

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubiquity.templates'
2--- debian/ubiquity.templates 2013-05-29 08:21:08 +0000
3+++ debian/ubiquity.templates 2013-06-24 01:08:28 +0000
4@@ -1476,7 +1476,7 @@
5 Template: ubiquity/text/use_crypto
6 Type: text
7 _Description:
8- Encrypt the new Ubuntu installation for security
9+ Encrypt the new ${RELEASE} installation for security
10
11 Template: ubiquity/text/use_crypto_desc
12 Type: text
13@@ -1486,7 +1486,7 @@
14 Template: ubiquity/text/use_lvm
15 Type: text
16 _Description:
17- Use LVM with the new Ubuntu installation
18+ Use LVM with the new ${RELEASE} installation
19
20 Template: ubiquity/text/use_lvm_desc
21 Type: text
22@@ -1511,7 +1511,7 @@
23 Template:ubiquity/text/crypto_description_2
24 Type: text
25 _Description:
26- Any files outside of Ubuntu will not be encrypted.
27+ Any files outside of ${RELEASE} will not be encrypted.
28
29 Template:ubiquity/text/crypto_warning
30 Type: text
31@@ -1571,7 +1571,7 @@
32 Template:ubiquity/text/parition_lvm_explanation
33 Type: text
34 _Description:
35- Logical Volume Management (LVM) lets Ubuntu treat multiple physical volumes as a single volume.
36+ Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical volumes as a single volume.
37
38 Template:ubiquity/text/partition_lvm_dialog
39 Type: text

Subscribers

People subscribed via source and target branches

to status/vote changes: