Merge lp:~rpadovani/reminders-app/updateStrings into lp:reminders-app

[Riccardo Padovani]

Update string for no account advice, removed reference to add reminder button

- Updated string for no account advice, see #1340635
- Removed reference to add reminder button in reminder page, see #1356966

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:223
http://91.189.93.70:8080/job/reminders-app-ci/485/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1585
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/181

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/485/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good, thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/238/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1692
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/130

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/239/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1718
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/131

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/240/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1722
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1722/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/132

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Please use the en-US spelling of "authorized", which can then be translated into en-GB as "authorised".

review: Needs Fixing

[Riccardo Padovani (rpadovani)]

Fixed, thanks.

Of course authorised was suggested by @popey :P

[Victor Thompson (vthompson)]

Thanks Riccardo! You'll also want to update the POT file.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:224
http://91.189.93.70:8080/job/reminders-app-ci/486/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1727
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/182

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/486/rebuild

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

Oh, man! What a distraction! Fixed

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:226
http://91.189.93.70:8080/job/reminders-app-ci/487/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1735/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1735/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/183

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/487/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

There appears to be an autopilot issue, unrelated to this change, however.

review: Approve

[Nicholas Skaggs (nskaggs)]

The error in the AP tests occurs in trunk, and is currently being worked;

(run.py:4309): GLib-GIO-CRITICAL **: g_simple_async_result_complete_in_idle: assertion 'G_IS_SIMPLE_ASYNC_RESULT (simple)' failed

I guess since it's happening in jenkins as well, the issue is even more urgent as it seems it will block mp's from landing.

[Leo Arias (elopio)]

I've found that this solves the error: http://paste.ubuntu.com/8195070/
I do not understand why. On the Glib MainLoop docs I can't find anything about a required wait after starting to run it. I think Martin Pitt knows a lot about GLib, so I will send him an email.

This is reported here: https://bugs.launchpad.net/reminders-app/+bug/1363604

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/244/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1802/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1802/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/136

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot	2014-08-14 17:17:05 +0000
+++ po/com.ubuntu.reminders.pot	2014-08-29 12:57:03 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: com.ubuntu.reminders\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 18:16+0100\n"
+"POT-Creation-Date: 2014-08-29 14:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -41,7 +41,7 @@
 msgstr ""
 
 #: ../src/app/qml/reminders.qml:320
-msgid "Please setup an account in the system settings"
+msgid "Please configure and authorize an Evernote account in System Settings"
 msgstr ""
 
 #: ../src/app/qml/reminders.qml:340
@@ -143,8 +143,8 @@
 
 #: ../src/app/qml/ui/RemindersPage.qml:108
 msgid ""
-"No reminders available. You can create new reminders using the \"Add reminder"
-"\" button or by setting a reminder when viewing a note."
+"No reminders available. You can create new reminders by setting a reminder "
+"when viewing a note."
 msgstr ""
 
 #: ../src/app/qml/ui/SearchNotesPage.qml:30

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-08-06 09:44:18 +0000
+++ src/app/qml/reminders.qml	2014-08-29 12:57:03 +0000
@@ -144,7 +144,7 @@
         onAuthenticated: {
             if (EvernoteConnection.token && EvernoteConnection.token != reply.AccessToken) {
                 EvernoteConnection.clearToken();
-            }            
+            }
             EvernoteConnection.token = reply.AccessToken;
         }
         onAuthenticationError: {
@@ -317,7 +317,7 @@
             id: noAccount
             objectName: "noAccountDialog"
             title: i18n.tr("No account available")
-            text: i18n.tr("Please setup an account in the system settings")
+            text: i18n.tr("Please configure and authorize an Evernote account in System Settings")
 
             Connections {
                 target: accounts

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2014-05-20 15:17:37 +0000
+++ src/app/qml/ui/RemindersPage.qml	2014-08-29 12:57:03 +0000
@@ -105,7 +105,7 @@
             wrapMode: Text.WordWrap
             horizontalAlignment: Text.AlignHCenter
             text: notes.error ? notes.error :
-                                i18n.tr("No reminders available. You can create new reminders using the \"Add reminder\" button or by setting a reminder when viewing a note.")
+                                i18n.tr("No reminders available. You can create new reminders by setting a reminder when viewing a note.")
         }
     }
 }