Merge lp:~apachelogger/ubiquity/fix-743062 into lp:ubiquity

[Harald Sitter]

2 bug fixes.

[Mackenzie Morgan (maco.m)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-16 22:42:16 +0000
+++ debian/changelog	2011-06-18 23:18:39 +0000
@@ -1,3 +1,11 @@
+ubiquity (2.7.10) UNRELEASED; urgency=low
+
+  * [KDE] Fix language selection comobox position within grid (LP: #743062)
+  * [KDE] Make intro label miminum expanding, otherwise word wrap will not
+    work for vast amounts of text
+
+ -- Harald Sitter <[e-mail]>  Sun, 19 Jun 2011 01:14:32 +0200
+
 ubiquity (2.7.9) oneiric; urgency=low
 
   [ Colin Watson ]

=== modified file 'gui/qt/stepLanguage.ui'
--- gui/qt/stepLanguage.ui	2011-01-31 12:05:44 +0000
+++ gui/qt/stepLanguage.ui	2011-06-18 23:18:39 +0000
@@ -36,6 +36,12 @@
    </item>
    <item row="2" column="0" rowspan="2" colspan="5">
     <widget class="QLabel" name="select_language_label">
+    <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
       <string>Please choose the language to use for the install process. This language will be the default language for this computer.</string>
      </property>
@@ -57,7 +63,7 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="2" rowspan="2">
+   <item row="4" column="2">
     <widget class="QComboBox" name="language_combobox">
      <property name="editable">
       <bool>false</bool>