ubuntu-touch-coreapps-reviewers team mailing list archive

[Alan Pope  <alan@xxxxxxxxxx>]

Alan Pope  has proposed merging lp:~popey/reminders-app/fix-1452924 into lp:reminders-app.

Commit message:
Modify conflict resolution message

Requested reviews:
  Ubuntu Notes app developers (notes-app-dev)
Related bugs:
  Bug #1452924 in Ubuntu Notes app: "Conflict resolution wording unclear"
  https://bugs.launchpad.net/reminders-app/+bug/1452924

For more details, see:
https://code.launchpad.net/~popey/reminders-app/fix-1452924/+merge/271845
-- 
Your team Ubuntu Notes app developers is requested to review the proposed merge of lp:~popey/reminders-app/fix-1452924 into lp:reminders-app.

=== modified file 'src/app/qml/ui/NoteConflictView.qml'
--- src/app/qml/ui/NoteConflictView.qml	2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/NoteConflictView.qml	2015-09-21 17:33:23 +0000
@@ -51,7 +51,7 @@
                     name: "weather-severe-alert-symbolic"
                 }
                 Label {
-                    text: i18n.tr("This note has been modified in multiple places. Please choose the version to be opened and delete the other.")
+                    text: i18n.tr("This note has been modified in multiple places. Open each version to check the content, then swipe to delete one of them.")
                     Layout.fillWidth: true
                     wrapMode: Text.WordWrap
                 }