ubuntu-touch-coreapps-reviewers team mailing list archive

[Matthew Paul Thomas <mpt@xxxxxxxxxxxxx>]

Matthew Paul Thomas has proposed merging lp:~mpt/reminders-app/1551780-setup into lp:reminders-app.

Requested reviews:
  Ubuntu Notes app developers (notes-app-dev)
Related bugs:
  Bug #1551780 in reminders-app (Ubuntu): "Intro uses “setup” as a verb"
  https://bugs.launchpad.net/ubuntu/+source/reminders-app/+bug/1551780

For more details, see:
https://code.launchpad.net/~mpt/reminders-app/1551780-setup/+merge/287658

Shortens and copyedits text in the Evernote sync dialog, fixing bug 1551780.
-- 
Your team Ubuntu Notes app developers is requested to review the proposed merge of lp:~mpt/reminders-app/1551780-setup into lp:reminders-app.

=== modified file 'src/app/qml/Reminders.qml'
--- src/app/qml/Reminders.qml	2015-11-20 11:11:49 +0000
+++ src/app/qml/Reminders.qml	2016-03-01 16:08:15 +0000
@@ -227,7 +227,7 @@
         switch (accounts.count) {
         case 0:
             PopupUtils.open(noAccountDialog, root);
-            print("No account available! Please setup an account in the system settings");
+            print("No account available. Please set up an account in System Settings.");
             break;
         case 1:
             print("Connecting to account", accounts.get(0, "displayName"), "as there is only one account available");
@@ -711,10 +711,9 @@
         Dialog {
             id: noAccount
             objectName: "noAccountDialog"
-            title: i18n.tr("Setup Evernote connection?")
+            title: i18n.tr("Sync with Evernote")
             text: i18n.tr("Notes can be stored on this device, or optionally synced with Evernote.") + " "
-                          + i18n.tr("In order to synchronize notes with Evernote, an account at Evernote is required.") + " "
-                          + i18n.tr("Do you want to setup an account now?")
+                          + i18n.tr("To sync with Evernote, you need an Evernote account.")
 
             Connections {
                 target: accounts
@@ -729,8 +728,7 @@
             RowLayout {
                 Button {
                     objectName: "openAccountButton"
-                    text: i18n.tr("No")
-                    color: UbuntuColors.red
+                    text: i18n.tr("Not Now")
                     onClicked: {
                         PopupUtils.close(noAccount)
                         accountService.startAuthentication("@local", null);
@@ -739,7 +737,7 @@
                 }
                 Button {
                     objectName: "openAccountButton"
-                    text: i18n.tr("Yes")
+                    text: i18n.tr("Set Up…")
                     color: UbuntuColors.green
                     onClicked: setup.exec()
                     Layout.fillWidth: true