Merge lp:~diegosarmentero/ubuntuone-windows-installer/cancel-prompt into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Fixed cancel prompt dialog (LP: #831985).

Fixed cancel prompt dialog.

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~diegosarmentero/ubuntuone-windows-installer/cancel-prompt]

38. By Diego Sarmentero on 2011-08-26

Removed unnecessary \ in strings.

39. By Diego Sarmentero on 2011-08-26

merge.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'data/qt/are_you_sure.ui'
--- data/qt/are_you_sure.ui	2011-07-07 13:19:04 +0000
+++ data/qt/are_you_sure.ui	2011-08-26 12:28:48 +0000
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>360</width>
+    <width>386</width>
     <height>196</height>
    </rect>
   </property>
@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Are you sure you want to cancel set up?</string>
+      <string>Are you sure you want to cancel setting up Ubuntu One?</string>
      </property>
      <property name="textFormat">
       <enum>Qt::PlainText</enum>
@@ -94,7 +94,7 @@
      <item>
       <widget class="QPushButton" name="pushButton_2">
        <property name="text">
-        <string>Continue setting up</string>
+        <string>No, continue setting up</string>
        </property>
        <property name="default">
         <bool>true</bool>

=== modified file 'ubuntuone_installer/gui/__init__.py'
--- ubuntuone_installer/gui/__init__.py	2011-07-08 11:28:53 +0000
+++ ubuntuone_installer/gui/__init__.py	2011-08-26 12:28:48 +0000
@@ -22,10 +22,10 @@
 
 _ = gettext.gettext
 
-ARE_YOU_SURE_1 = _("You can restart the sign up process at any time by "
-    "clicking on Ubuntu One in your Start menu.")
-ARE_YOU_SURE_2 = _("If you need to know more about Ubuntu One then please"
-    " go to %(url)s")
+ARE_YOU_SURE_1 = _("You can restart the setup process at any time "
+    "by clicking on Ubuntu One in your Start menu.")
+ARE_YOU_SURE_2 = _("If you need to know more about Ubuntu One, then please "
+    "go to %(url)s")
 LOCAL_FOLDERS_TITLE = _("Syncing your computer with the cloud")
 LOCAL_FOLDERS_SPACE_HEADER = _("Space (%s)")
 LOCAL_FOLDERS_OFFER_LABEL = _("The folders you have selected to sync "