Merge lp:~mpt/ubiquity/3d-graphics-text into lp:ubiquity

[Matthew Paul Thomas]

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'.

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.

[Andrew Sinclair (andrew-sinclair)]

I'm comfortable with the text changes. Are we distributing a graphics driver that was not part of the installer before?

review: Approve (legal)

[lp:~mpt/ubiquity/3d-graphics-text]

5508. By Matthew Paul Thomas on 2012-06-19

Removes the word '3-D'.

[Matthew Paul Thomas (mpt)]

Andrew, thanks for the review. I don't know whether we were distributing it before, but the Nvidia graphics driver will now be installed if you have an Nvidia graphics card and check the checkbox. <https://github.com/tseliot/ubuntu-drivers-common/commit/3edabca8>

[Evan (ev)]

Looks good!

review: Approve

=== modified file 'gui/gtk/stepPrepare.ui'
--- gui/gtk/stepPrepare.ui	2012-02-16 03:36:43 +0000
+++ gui/gtk/stepPrepare.ui	2012-06-19 08:50:24 +0000
@@ -119,7 +119,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">${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.</property>
+                    <property name="label" translatable="yes">${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.</property>
                     <property name="wrap">True</property>
                   </object>
                   <packing>