Merge lp:~dpm/reminders-app/fix-1317683-update-template into lp:reminders-app

[David Planella]

Update translations template.

Update translations template. I've temporarily added the po/po.pro file I've used to generate it. I'll remove it as soon as I write proper CMake rules to build and update the template (in a separate MP).

[Daniel Holbach (dholbach)]

Thanks. Good work!

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/131/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2652
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2652/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/189
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/189/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/131
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/23

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:140
http://91.189.93.70:8080/job/reminders-app-ci/356/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2653
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2653/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/190
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/357
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/51

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

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/133/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2663
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2663/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/200
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/133
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/25/console

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-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.
http://91.189.93.70:8080/job/reminders-app-autolanding/134/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2664
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2664/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/201
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/134
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/26

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-01-28 08:38:08 +0000
+++ po/com.ubuntu.reminders.pot	2014-05-15 09:42:23 +0000
@@ -1,14 +1,14 @@
-# Translations for the Reminders app
+# reminders-app translations.
 # Copyright (C) 2014 Canonical Ltd.
-# This file is distributed under the same license as the reminders package.
+# This file is distributed under the same license as the reminders-app package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: com.ubuntu.reminders\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-28 09:36+0100\n"
+"POT-Creation-Date: 2014-05-15 11:25+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"
@@ -16,68 +16,220 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: src/app/qml/components/NotebooksDelegate.qml:58
-#, qt-format
-msgid "%1 note"
-msgid_plural "%1 notes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/app/qml/reminders.qml:83
+
+#: ../src/app/qml/reminders.qml:196
 msgid "Notes"
 msgstr ""
 
-#: src/app/qml/reminders.qml:90
+#: ../src/app/qml/reminders.qml:225
 msgid "Notebooks"
 msgstr ""
 
-#: src/app/qml/reminders.qml:97
+#: ../src/app/qml/reminders.qml:253
+#: ../.build/com.ubuntu.reminders.desktop.js:1
 msgid "Reminders"
 msgstr ""
 
-#: src/app/qml/ui/EditNotePage.qml:83 src/app/qml/ui/EditNotePage.qml:95
+#: ../src/app/qml/reminders.qml:310
+msgid "No account available"
+msgstr ""
+
+#: ../src/app/qml/reminders.qml:311
+msgid "Please setup an account in the system settings"
+msgstr ""
+
+#: ../src/app/qml/reminders.qml:325
+msgid "Open account settings"
+msgstr ""
+
+#: ../src/app/qml/components/NotebooksDelegate.qml:66
+#, qt-format
+msgid "Last edited %1"
+msgstr ""
+
+#: ../src/app/qml/components/NotebooksDelegate.qml:72
+msgid "Shared"
+msgstr ""
+
+#: ../src/app/qml/components/NotebooksDelegate.qml:72
+msgid "Private"
+msgstr ""
+
+#: ../src/app/qml/components/PulldownListView.qml:40
+msgid "Release to refresh"
+msgstr ""
+
+#: ../src/app/qml/components/RemindersDelegate.qml:51
+#: ../src/app/qml/ui/SetReminderView.qml:55
+msgid "Clear reminder"
+msgstr ""
+
+#: ../src/app/qml/components/RemindersDelegate.qml:51
+msgid "Mark as done"
+msgstr ""
+
+#: ../src/app/qml/ui/CameraConfirm.qml:40
+msgid "Back"
+msgstr ""
+
+#: ../src/app/qml/ui/CameraConfirm.qml:49
+msgid "Use it!"
+msgstr ""
+
+#: ../src/app/qml/ui/EditNoteView.qml:90
+#: ../src/app/qml/ui/EditNoteView.qml:102
 msgid "Untitled"
 msgstr ""
 
-#: src/app/qml/ui/NotePage.qml:36
+#: ../src/app/qml/ui/NotePage.qml:33 ../src/app/qml/ui/NotesPage.qml:71
 msgid "Delete"
 msgstr ""
 
-#: src/app/qml/ui/NotePage.qml:53
+#: ../src/app/qml/ui/NotePage.qml:42 ../src/app/qml/ui/NotesPage.qml:79
+msgid "Edit reminder"
+msgstr ""
+
+#: ../src/app/qml/ui/NotePage.qml:42 ../src/app/qml/ui/NotesPage.qml:79
+#: ../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:36 src/app/qml/ui/NotesPage.qml:39
-#: src/app/qml/ui/RemindersPage.qml:30 src/app/qml/ui/SearchNotesPage.qml:52
+#: ../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
 msgid "Search"
 msgstr ""
 
-#: src/app/qml/ui/NotebooksPage.qml:46
+#: ../src/app/qml/ui/NotebooksPage.qml:46 ../src/app/qml/ui/NotesPage.qml:52
+msgid "Refresh"
+msgstr ""
+
+#: ../src/app/qml/ui/NotebooksPage.qml:56 ../src/app/qml/ui/NotesPage.qml:60
+#: ../src/app/qml/ui/RemindersPage.qml:43
+msgid "Accounts"
+msgstr ""
+
+#: ../src/app/qml/ui/NotebooksPage.qml:65
 msgid "Add notebook"
 msgstr ""
 
-#: src/app/qml/ui/NotebooksPage.qml:104
-msgid "Shared"
-msgstr ""
-
-#: src/app/qml/ui/NotebooksPage.qml:104
-msgid "Private"
-msgstr ""
-
-#: src/app/qml/ui/NotebooksPage.qml:126
+#: ../src/app/qml/ui/NotebooksPage.qml:164
 msgid "Cancel"
 msgstr ""
 
-#: src/app/qml/ui/NotebooksPage.qml:134
+#: ../src/app/qml/ui/NotebooksPage.qml:172
 msgid "Save"
 msgstr ""
 
-#: src/app/qml/ui/NotesPage.qml:49
+#: ../src/app/qml/ui/NotesPage.qml:103
 msgid "Add note"
 msgstr ""
 
-#: src/app/qml/ui/RemindersPage.qml:40
+#: ../src/app/qml/ui/NotesPage.qml:173
+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
+msgid ""
+"No reminders available. You can create new reminders using the \"Add reminder"
+"\" button or by setting a reminder when viewing a note."
+msgstr ""
+
+#: ../src/app/qml/ui/SetReminderView.qml:36
+msgid "Select date and time for the reminder:"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:82 ../src/plugin/Evernote/note.cpp:239
+msgid "Today"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:85
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:88
+msgid "Last week"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:91
+msgid "Two weeks ago"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:94
+#, qt-format
+msgid "%1 %2"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:227
+msgid "Done"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:233
+msgid "No date"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:236
+msgid "Overdue"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:242
+msgid "Tomorrow"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:245
+msgid "Next week"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:248
+msgid "In two weeks"
+msgstr ""
+
+#: ../src/plugin/Evernote/note.cpp:250
+msgid "Later"
+msgstr ""
+
+#. TRANSLATORS: this is part of a longer string - "Last updated: today"
+#: ../src/plugin/Evernote/notebook.cpp:99
+msgid "today"
+msgstr ""
+
+#. TRANSLATORS: this is part of a longer string - "Last updated: yesterday"
+#: ../src/plugin/Evernote/notebook.cpp:103
+msgid "yesterday"
+msgstr ""
+
+#. TRANSLATORS: this is part of a longer string - "Last updated: last week"
+#: ../src/plugin/Evernote/notebook.cpp:107
+msgid "last week"
+msgstr ""
+
+#. TRANSLATORS: this is part of a longer string - "Last updated: two weeks ago"
+#: ../src/plugin/Evernote/notebook.cpp:111
+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
+#, qt-format
+msgid "on %1 %2"
+msgstr ""
+
+#: ../src/plugin/Evernote/notesstore.cpp:217
+#, qt-format
+msgid "Error refreshing notes: %1"
+msgstr ""
+
+#: ../src/plugin/Evernote/notesstore.cpp:368
+#, qt-format
+msgid "Error refreshing notebooks: %1"
+msgstr ""

=== added file 'po/po.pro'
--- po/po.pro	1970-01-01 00:00:00 +0000
+++ po/po.pro	2014-05-15 09:42:23 +0000
@@ -0,0 +1,59 @@
+TEMPLATE = subdirs
+
+PROJECTNAME = com.ubuntu.reminders
+
+DESKTOPFILE = ../$${PROJECTNAME}.desktop.in
+
+SOURCECODE = ../src/app/qml/*.qml \
+             ../src/app/qml/components/*.qml \
+             ../src/app/qml/ui/CameraComponents/*.qml \
+             ../src/app/qml/ui/*.qml \
+             ../src/app/*.cpp \
+             ../src/app/*.h \
+             ../src/plugin/Evernote/*.cpp \
+             ../src/plugin/Evernote/*.h \
+             ../src/plugin/Evernote/jobs/*.cpp \
+             ../src/plugin/Evernote/jobs/*.h \
+             ../src/plugin/Evernote/jobs/*.cpp \
+             ../src/plugin/Evernote/utils/*.h
+
+BUILDDIR = ../.build
+DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
+
+message("")
+message(" Project Name: $$PROJECTNAME ")
+message(" Source Code: $$SOURCECODE ")
+message("")
+message(" Run 'make pot' to generate the pot file from source code. ")
+message("")
+
+## Generate pot file 'make pot'
+potfile.target = pot
+potfile.commands = xgettext \
+                   -o $${PROJECTNAME}.pot \
+		   --copyright=\"Canonical Ltd.\" \
+		   --package-name $${PROJECTNAME} \
+		   --qt --c++ --add-comments=TRANSLATORS \
+		   --keyword=tr --keyword=tr:1,2 \
+		   $${SOURCECODE} $${DESKTOPFILETEMP}
+potfile.depends = desktopfile
+QMAKE_EXTRA_TARGETS += potfile
+
+## Do not use this rule directly. It's a dependency rule to
+## generate an intermediate .h file to extract translatable
+## strings from the .desktop file
+desktopfile.target = desktopfile
+desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}
+desktopfile.depends = makebuilddir
+QMAKE_EXTRA_TARGETS += desktopfile
+
+## Dependency rule to create the temporary build dir
+makebuilddir.target = makebuilddir
+makebuilddir.commands = mkdir -p $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += makebuilddir
+
+## Rule to clean the products of the build
+clean.target = clean
+clean.commands = rm -Rf $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += clean
+

=== removed file 'po/reminders-app.pot'
--- po/reminders-app.pot	2013-11-20 21:54:24 +0000
+++ po/reminders-app.pot	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# Reminders App Translations
-# Copyright (C) 2013 Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: reminders-app\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-20 22:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: reminders-app.qml:38
-msgid "Notes"
-msgstr ""
-
-#: reminders-app.qml:45
-msgid "Notebook"
-msgstr ""
-
-#: reminders-app.qml:52
-msgid "Reminders"
-msgstr ""