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

[Riccardo Padovani]

Added a couple of new i18n.tr, updated the translations template

Added a couple of new i18n.tr, updated the translations template

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

PASSED: Continuous integration, rev:193
http://91.189.93.70:8080/job/reminders-app-ci/464/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1120
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/160

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Thanks! Just a small nitpick: see the inline comment about the copyright notice on the .pot file.

review: Needs Fixing

[lp:~rpadovani/reminders-app/translationsUpdate]

194. By Riccardo Padovani on 2014-07-24

Fixed copyright in translations template

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

PASSED: Continuous integration, rev:194
http://91.189.93.70:8080/job/reminders-app-ci/465/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1126
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/161

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Thanks!

review: Approve

=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot	2014-05-15 09:27:34 +0000
+++ po/com.ubuntu.reminders.pot	2014-07-24 10:32:59 +0000
@@ -1,4 +1,4 @@
-# reminders-app translations.
+# reminders-app translations
 # Copyright (C) 2014 Canonical Ltd.
 # This file is distributed under the same license as the reminders-app package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: com.ubuntu.reminders\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-15 11:25+0200\n"
+"POT-Creation-Date: 2014-07-23 23:40+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"
@@ -17,41 +17,48 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/app/qml/reminders.qml:196
+#: ../src/app/qml/reminders.qml:201
 msgid "Notes"
 msgstr ""
 
-#: ../src/app/qml/reminders.qml:225
+#: ../src/app/qml/reminders.qml:230
 msgid "Notebooks"
 msgstr ""
 
-#: ../src/app/qml/reminders.qml:253
+#: ../src/app/qml/reminders.qml:258
 #: ../.build/com.ubuntu.reminders.desktop.js:1
 msgid "Reminders"
 msgstr ""
 
-#: ../src/app/qml/reminders.qml:310
+#: ../src/app/qml/reminders.qml:278
+msgid ""
+"No note selected.\n"
+"Select a note to see it in detail."
+msgstr ""
+
+#: ../src/app/qml/reminders.qml:315
 msgid "No account available"
 msgstr ""
 
-#: ../src/app/qml/reminders.qml:311
+#: ../src/app/qml/reminders.qml:316
 msgid "Please setup an account in the system settings"
 msgstr ""
 
-#: ../src/app/qml/reminders.qml:325
-msgid "Open account settings"
+#: ../src/app/qml/reminders.qml:336
+#: ../src/app/qml/ui/AccountSelectorPage.qml:63
+msgid "Add account"
 msgstr ""
 
-#: ../src/app/qml/components/NotebooksDelegate.qml:66
+#: ../src/app/qml/components/NotebooksDelegate.qml:68
 #, qt-format
 msgid "Last edited %1"
 msgstr ""
 
-#: ../src/app/qml/components/NotebooksDelegate.qml:72
+#: ../src/app/qml/components/NotebooksDelegate.qml:75
 msgid "Shared"
 msgstr ""
 
-#: ../src/app/qml/components/NotebooksDelegate.qml:72
+#: ../src/app/qml/components/NotebooksDelegate.qml:75
 msgid "Private"
 msgstr ""
 
@@ -59,12 +66,16 @@
 msgid "Release to refresh"
 msgstr ""
 
-#: ../src/app/qml/components/RemindersDelegate.qml:51
+#: ../src/app/qml/components/PulldownListView.qml:40
+msgid "Pull down to refresh"
+msgstr ""
+
+#: ../src/app/qml/components/RemindersDelegate.qml:50
 #: ../src/app/qml/ui/SetReminderView.qml:55
 msgid "Clear reminder"
 msgstr ""
 
-#: ../src/app/qml/components/RemindersDelegate.qml:51
+#: ../src/app/qml/components/RemindersDelegate.qml:50
 msgid "Mark as done"
 msgstr ""
 
@@ -76,69 +87,65 @@
 msgid "Use it!"
 msgstr ""
 
-#: ../src/app/qml/ui/EditNoteView.qml:90
-#: ../src/app/qml/ui/EditNoteView.qml:102
+#: ../src/app/qml/ui/EditNoteView.qml:98
+#: ../src/app/qml/ui/EditNoteView.qml:110
 msgid "Untitled"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:33 ../src/app/qml/ui/NotesPage.qml:71
-msgid "Delete"
+#: ../src/app/qml/ui/NotePage.qml:34 ../src/app/qml/ui/NotesPage.qml:112
+msgid "Edit"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:42 ../src/app/qml/ui/NotesPage.qml:79
+#: ../src/app/qml/ui/NotePage.qml:43 ../src/app/qml/ui/NotesPage.qml:96
 msgid "Edit reminder"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:42 ../src/app/qml/ui/NotesPage.qml:79
+#: ../src/app/qml/ui/NotePage.qml:43 ../src/app/qml/ui/NotesPage.qml:96
 #: ../src/app/qml/ui/SetReminderView.qml:66
 msgid "Set reminder"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:54 ../src/app/qml/ui/NotesPage.qml:93
-msgid "Edit"
-msgstr ""
-
-#: ../src/app/qml/ui/NotebooksPage.qml:38 ../src/app/qml/ui/NotesPage.qml:44
-#: ../src/app/qml/ui/RemindersPage.qml:33
-#: ../src/app/qml/ui/SearchNotesPage.qml:56
+#: ../src/app/qml/ui/NotePage.qml:57 ../src/app/qml/ui/NotesPage.qml:86
+msgid "Delete"
+msgstr ""
+
+#: ../src/app/qml/ui/NotebooksPage.qml:41
+msgid "Add notebook"
+msgstr ""
+
+#: ../src/app/qml/ui/NotebooksPage.qml:51 ../src/app/qml/ui/NotesPage.qml:55
+#: ../src/app/qml/ui/RemindersPage.qml:34
+#: ../src/app/qml/ui/SearchNotesPage.qml:58
 msgid "Search"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:46 ../src/app/qml/ui/NotesPage.qml:52
+#: ../src/app/qml/ui/NotebooksPage.qml:61 ../src/app/qml/ui/NotesPage.qml:65
 msgid "Refresh"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:56 ../src/app/qml/ui/NotesPage.qml:60
-#: ../src/app/qml/ui/RemindersPage.qml:43
+#: ../src/app/qml/ui/NotebooksPage.qml:71 ../src/app/qml/ui/NotesPage.qml:75
+#: ../src/app/qml/ui/RemindersPage.qml:44
 msgid "Accounts"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:65
-msgid "Add notebook"
-msgstr ""
-
-#: ../src/app/qml/ui/NotebooksPage.qml:164
+#: ../src/app/qml/ui/NotebooksPage.qml:173
 msgid "Cancel"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:172
+#: ../src/app/qml/ui/NotebooksPage.qml:182
 msgid "Save"
 msgstr ""
 
-#: ../src/app/qml/ui/NotesPage.qml:103
+#: ../src/app/qml/ui/NotesPage.qml:45
 msgid "Add note"
 msgstr ""
 
-#: ../src/app/qml/ui/NotesPage.qml:173
+#: ../src/app/qml/ui/NotesPage.qml:185
 msgid ""
 "No notes available. You can create new notes using the \"Add note\" button."
 msgstr ""
 
-#: ../src/app/qml/ui/RemindersPage.qml:52
-msgid "Add reminder"
-msgstr ""
-
-#: ../src/app/qml/ui/RemindersPage.qml:113
+#: ../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."
@@ -148,7 +155,7 @@
 msgid "Select date and time for the reminder:"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:82 ../src/plugin/Evernote/note.cpp:239
+#: ../src/plugin/Evernote/note.cpp:82 ../src/plugin/Evernote/note.cpp:240
 msgid "Today"
 msgstr ""
 
@@ -164,72 +171,89 @@
 msgid "Two weeks ago"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:94
+#. TRANSLATORS: the first argument refers to a month name and the second to a year
+#: ../src/plugin/Evernote/note.cpp:95
 #, qt-format
 msgid "%1 %2"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:227
+#: ../src/plugin/Evernote/note.cpp:228
 msgid "Done"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:233
+#: ../src/plugin/Evernote/note.cpp:234
 msgid "No date"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:236
+#: ../src/plugin/Evernote/note.cpp:237
 msgid "Overdue"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:242
+#: ../src/plugin/Evernote/note.cpp:243
 msgid "Tomorrow"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:245
+#: ../src/plugin/Evernote/note.cpp:246
 msgid "Next week"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:248
+#: ../src/plugin/Evernote/note.cpp:249
 msgid "In two weeks"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:250
+#: ../src/plugin/Evernote/note.cpp:251
 msgid "Later"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: today"
-#: ../src/plugin/Evernote/notebook.cpp:99
+#: ../src/plugin/Evernote/notebook.cpp:100
 msgid "today"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: yesterday"
-#: ../src/plugin/Evernote/notebook.cpp:103
+#: ../src/plugin/Evernote/notebook.cpp:104
 msgid "yesterday"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: last week"
-#: ../src/plugin/Evernote/notebook.cpp:107
+#: ../src/plugin/Evernote/notebook.cpp:108
 msgid "last week"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: two weeks ago"
-#: ../src/plugin/Evernote/notebook.cpp:111
+#: ../src/plugin/Evernote/notebook.cpp:112
 msgid "two weeks ago"
 msgstr ""
 
 #. TRANSLATORS: this is used in the notes list to group notes created on the same month
 #. the first parameter refers to a month name and the second to a year
-#: ../src/plugin/Evernote/notebook.cpp:115
+#: ../src/plugin/Evernote/notebook.cpp:116
 #, qt-format
 msgid "on %1 %2"
 msgstr ""
 
-#: ../src/plugin/Evernote/notesstore.cpp:217
+#: ../src/plugin/Evernote/notesstore.cpp:223
 #, qt-format
 msgid "Error refreshing notes: %1"
 msgstr ""
 
-#: ../src/plugin/Evernote/notesstore.cpp:368
+#: ../src/plugin/Evernote/notesstore.cpp:375
 #, qt-format
 msgid "Error refreshing notebooks: %1"
 msgstr ""
+
+#: ../src/plugin/Evernote/jobs/evernotejob.cpp:87
+msgid "Authentication expired."
+msgstr ""
+
+#: ../src/plugin/Evernote/jobs/evernotejob.cpp:91
+msgid "Limit exceeded."
+msgstr ""
+
+#: ../src/plugin/Evernote/jobs/evernotejob.cpp:95
+msgid "Rate limit exceeded."
+msgstr ""
+
+#: ../src/plugin/Evernote/jobs/evernotejob.cpp:99
+msgid "Quota exceeded."
+msgstr ""

=== modified file 'src/app/qml/components/PulldownListView.qml'
--- src/app/qml/components/PulldownListView.qml	2014-05-14 12:59:20 +0000
+++ src/app/qml/components/PulldownListView.qml	2014-07-24 10:32:59 +0000
@@ -37,7 +37,7 @@
         anchors.bottom: root.contentItem.top;
         fontSize: 'medium'
         horizontalAlignment: Text.AlignHCenter
-        text: priv.toBeReloaded ? i18n.tr("Release to refresh") : ("Pull down to refresh")
+        text: priv.toBeReloaded ? i18n.tr("Release to refresh") : i18n.tr("Pull down to refresh")
         color: "#b3b3b3" 
     }
 

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-07-08 12:21:36 +0000
+++ src/app/qml/reminders.qml	2014-07-24 10:32:59 +0000
@@ -275,7 +275,7 @@
         anchors.centerIn: parent
         anchors.horizontalCenterOffset: pagestack.width / 2
         visible: !root.narrowMode
-        text: "No note selected.\nSelect a note to see it in detail."
+        text: i18n.tr("No note selected.\nSelect a note to see it in detail.")
         wrapMode: Text.WordWrap
         horizontalAlignment: Text.AlignHCenter
         fontSize: "large"