Merge lp:~diegosarmentero/ubuntuone-windows-installer/fix-823203 into lp:ubuntuone-windows-installer

Proposed by Diego Sarmentero
Status: Merged
Approved by: Roberto Alsina
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
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+74471@code.launchpad.net

Commit message

Fixed issues: 823203, 828714

Description of the change

Fixed issues: 823203, 828714

To post a comment you must log in.
Roberto Alsina (ralsina) wrote :

+1 trivial

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 <item>
6 <widget class="QPushButton" name="check_settings_button">
7 <property name="text">
8- <string>Check bandwidth settings</string>
9+ <string>Check settings</string>
10 </property>
11 </widget>
12 </item>
13
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 <item>
19 <widget class="QLabel" name="label">
20 <property name="text">
21- <string>Let's get started! First choose which folder you want to sync to your Ubuntu One personal cloud from this computer.
22-To help you get going we have suggested a few.</string>
23+ <string>Ok! Now it's time to choose which folder sync to the cloud from this computer.
24+We started by suggesting a few.</string>
25 </property>
26 <property name="textFormat">
27 <enum>Qt::PlainText</enum>
28@@ -32,30 +32,6 @@
29 </widget>
30 </item>
31 <item>
32- <layout class="QHBoxLayout" name="horizontalLayout_2">
33- <item>
34- <widget class="QLabel" name="label_2">
35- <property name="text">
36- <string>Folders on my computer</string>
37- </property>
38- </widget>
39- </item>
40- <item>
41- <spacer name="horizontalSpacer_3">
42- <property name="orientation">
43- <enum>Qt::Horizontal</enum>
44- </property>
45- <property name="sizeHint" stdset="0">
46- <size>
47- <width>40</width>
48- <height>20</height>
49- </size>
50- </property>
51- </spacer>
52- </item>
53- </layout>
54- </item>
55- <item>
56 <widget class="QTreeWidget" name="folder_list">
57 <property name="indentation">
58 <number>0</number>

Subscribers

People subscribed via source and target branches