Merge lp:~mpt/reminders-app/1551780-setup into lp:reminders-app

[Matthew Paul Thomas]

update some strings

Shortens and copyedits text in the Evernote sync dialog, fixing bug 1551780.

Also changes the dialog buttons:
* “No” to “Not Now”, since you can change your mind later
* red to grey, since a single dialog shouldn't have both green and red buttons
* “Yes” to “Set Up…”, since you have to do something more to set up the account.

[Michael Zanetti (mzanetti)]

thanks!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~mpt/reminders-app/1551780-setup/+merge/287658/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/295/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5646/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/306/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5686/console

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/307/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5687/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== 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