Merge lp://qastaging/~mpt/ubiquity/3d-graphics-text into lp://qastaging/ubiquity
Status: | Merged |
---|---|
Merged at revision: | 5509 |
Proposed branch: | lp://qastaging/~mpt/ubiquity/3d-graphics-text |
Merge into: | lp://qastaging/ubiquity |
Diff against target: |
12 lines (+1/-1) 1 file modified
gui/gtk/stepPrepare.ui (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~mpt/ubiquity/3d-graphics-text |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Evan (community) | Approve | ||
Andrew Sinclair (community) | legal | Approve | |
Review via email: mp+110565@code.qastaging.launchpad.net |
Commit message
Adds mention of graphics drivers. Changes 'display' to 'play'. Changes 'wireless' to 'wi-fi'. Changes 'closed-source' to 'proprietary', matching Ubuntu Software Center. Removes repetition of 'the software'.
Description of the change
This branch changes the Ubuntu installer's third-party software text from this:
${RELEASE} uses third-party software to display Flash, MP3 and other media, and to work with some wireless hardware. Some of this software is closed-source. The software is subject to the license terms included with the software's documentation.
To this:
${RELEASE} uses third-party software to play Flash, MP3 and other media, and to work with some graphics and wi-fi hardware. Some of this software is proprietary. The software is subject to license terms included with its documentation.
The changes in case you missed them:
* Changes "display" to "play" (since MP3 is about audio, not video).
* Adds mention of graphics drivers (because the installer may install a Nvidia proprietary driver).
* Changes "wireless" to "wi-fi".
* Changes "closed-source" to "proprietary", matching Ubuntu Software Center.
* Removes repetition of "the software", by changing "the software's documentation" to "its documentation".
This paragraph is legally important, so changes should get legal review.
I'm comfortable with the text changes. Are we distributing a graphics driver that was not part of the installer before?