1
=== modified file 'data/qt/folders.ui'
2
--- data/qt/folders.ui	2011-09-02 12:58:29 +0000
3
+++ data/qt/folders.ui	2011-09-07 16:35:53 +0000
4
@@ -35,7 +35,7 @@
5
35
     <item>
35
     <item>
6
36
      <widget class="QPushButton" name="check_settings_button">
36
      <widget class="QPushButton" name="check_settings_button">
7
37
       <property name="text">
37
       <property name="text">
9
38
        <string>Check bandwidth settings</string>
38
        <string>Check settings</string>
10
39
       </property>
39
       </property>
11
40
      </widget>
40
      </widget>
12
41
     </item>
41
     </item>
13
42
42
14
=== modified file 'data/qt/local_folders.ui'
15
--- data/qt/local_folders.ui	2011-09-02 12:58:29 +0000
16
+++ data/qt/local_folders.ui	2011-09-07 16:35:53 +0000
17
@@ -20,8 +20,8 @@
18
20
   <item>
20
   <item>
19
21
    <widget class="QLabel" name="label">
21
    <widget class="QLabel" name="label">
20
22
     <property name="text">
22
     <property name="text">
23
23
      <string>Let's get started! First choose which folder you want to sync to your Ubuntu One personal cloud from this computer.
23
      <string>Ok! Now it's time to choose which folder sync to the cloud from this computer.
24
24
To help you get going we have suggested a few.</string>
24
We started by suggesting a few.</string>
25
25
     </property>
25
     </property>
26
26
     <property name="textFormat">
26
     <property name="textFormat">
27
27
      <enum>Qt::PlainText</enum>
27
      <enum>Qt::PlainText</enum>
28
@@ -32,30 +32,6 @@
29
32
    </widget>
32
    </widget>
30
33
   </item>
33
   </item>
31
34
   <item>
34
   <item>
32
35
    <layout class="QHBoxLayout" name="horizontalLayout_2">
33
36
     <item>
34
37
      <widget class="QLabel" name="label_2">
35
38
       <property name="text">
36
39
        <string>Folders on my computer</string>
37
40
       </property>
38
41
      </widget>
39
42
     </item>
40
43
     <item>
41
44
      <spacer name="horizontalSpacer_3">
42
45
       <property name="orientation">
43
46
        <enum>Qt::Horizontal</enum>
44
47
       </property>
45
48
       <property name="sizeHint" stdset="0">
46
49
        <size>
47
50
         <width>40</width>
48
51
         <height>20</height>
49
52
        </size>
50
53
       </property>
51
54
      </spacer>
52
55
     </item>
53
56
    </layout>
54
57
   </item>
55
58
   <item>
56
59
    <widget class="QTreeWidget" name="folder_list">
35
    <widget class="QTreeWidget" name="folder_list">
57
60
     <property name="indentation">
36
     <property name="indentation">
58
61
      <number>0</number>
37
      <number>0</number>
Status:	Merged
Approved by:	Roberto Alsina on 2011-09-07
Approved revision:	52
Merged at revision:	52
Proposed branch:	lp:~diegosarmentero/ubuntuone-windows-installer/fix-823203
Merge into:	lp:ubuntuone-windows-installer
Diff against target:	58 lines (+3/-27) 2 files modified data/qt/folders.ui (+1/-1) data/qt/local_folders.ui (+2/-26)
To merge this branch:	bzr merge lp:~diegosarmentero/ubuntuone-windows-installer/fix-823203
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Roberto Alsina (community)		2011-09-07	Approve on 2011-09-07
Review via email: mp+74471@code.launchpad.net