Merge lp:~dpm/reminders-app/update-translations-after-cleanup into lp:reminders-app

[David Planella]

Update and fix translatable messages

We want to ensure translations are in shape for contribution. This MP:

- Updates the .pot file to expose the new translatable strings in Launchpad
- Makes a few more strings translatable
- Makes the cmake rule to update the .pot file work (run it with `make com.ubuntu.reminders.pot`)
- Fixes a plural string
- Capitalizes some of the actions to make them consistent with the rest of the UI

I believe fixing the translations' cmake rule might need another iteration, but at least now the .pot file can be built manually.

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

FAILED: Continuous integration, rev:41
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dpm/reminders-app/update-translations-after-cleanup/+merge/203487/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/83/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/841
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/83
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/83

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-28 08:43:55 +0000
+++ CMakeLists.txt	2014-01-28 08:43:55 +0000
@@ -44,7 +44,7 @@
 
 file(GLOB_RECURSE I18N_SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     rc/**.qml desktop/**.desktop.in)
+     src/app/qml/*.qml *.desktop.in)
 list(SORT I18N_SRC_FILES)
 
 

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-01-19 13:59:12 +0000
+++ po/CMakeLists.txt	2014-01-28 08:43:55 +0000
@@ -11,7 +11,7 @@
                           --from-code=UTF-8
                           --c++ --qt --add-comments=TRANSLATORS
                           --keyword=tr --keyword=tr:1,2
-						  --package-name='${PROJECT}'
+                          --package-name='${PROJECT}'
                           --copyright-holder='Canonical Ltd.'
                           ${I18N_SRC_FILES})
 

=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot	2014-01-24 17:41:21 +0000
+++ po/com.ubuntu.reminders.pot	2014-01-28 08:43:55 +0000
@@ -1,6 +1,6 @@
-# reminders-app translation.
+# Translations for the Reminders app
 # Copyright (C) 2014 Canonical Ltd.
-# This file is distributed under the same license as the reminders-app package.
+# This file is distributed under the same license as the reminders package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-24 13:10+0100\n"
+"POT-Creation-Date: 2014-01-28 09:36+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"
@@ -25,38 +25,22 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/app/qml/reminders-app.qml:71
+#: src/app/qml/reminders.qml:83
 msgid "Notes"
 msgstr ""
 
-#: src/app/qml/reminders-app.qml:78
+#: src/app/qml/reminders.qml:90
 msgid "Notebooks"
 msgstr ""
 
-#: src/app/qml/reminders-app.qml:85
+#: src/app/qml/reminders.qml:97
 msgid "Reminders"
 msgstr ""
 
-#: src/app/qml/ui/EditNotePage.qml:31 src/app/qml/ui/NotebooksPage.qml:134
-msgid "Save"
-msgstr ""
-
-#: src/app/qml/ui/EditNotePage.qml:34 src/app/qml/ui/EditNotePage.qml:74
+#: src/app/qml/ui/EditNotePage.qml:83 src/app/qml/ui/EditNotePage.qml:95
 msgid "Untitled"
 msgstr ""
 
-#: src/app/qml/ui/EditNotePage.qml:53
-msgid "Attach"
-msgstr ""
-
-#: src/app/qml/ui/EditNotePage.qml:57
-msgid "Shot"
-msgstr ""
-
-#: src/app/qml/ui/EditNotePage.qml:86
-msgid "Notebook"
-msgstr ""
-
 #: src/app/qml/ui/NotePage.qml:36
 msgid "Delete"
 msgstr ""
@@ -86,6 +70,10 @@
 msgid "Cancel"
 msgstr ""
 
+#: src/app/qml/ui/NotebooksPage.qml:134
+msgid "Save"
+msgstr ""
+
 #: src/app/qml/ui/NotesPage.qml:49
 msgid "Add note"
 msgstr ""

=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
--- src/app/qml/components/NotebooksDelegate.qml	2014-01-28 08:43:55 +0000
+++ src/app/qml/components/NotebooksDelegate.qml	2014-01-28 08:43:55 +0000
@@ -55,6 +55,6 @@
     Label {
         id: resourceImage
         anchors { top: parent.top; right: parent.right; bottom: parent.bottom; topMargin: units.gu(1); rightMargin: units.gu(2) }
-        text: i18n.tr("%1 notes").arg(root.noteCount)
+        text: i18n.tr("%1 note", "%1 notes", root.noteCount).arg(root.noteCount)
     }
 }

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2014-01-28 08:43:55 +0000
+++ src/app/qml/ui/NotePage.qml	2014-01-28 08:43:55 +0000
@@ -33,7 +33,7 @@
 
     tools: ToolbarItems {
         ToolbarButton {
-            text: "delete"
+            text: i18n.tr("Delete")
             iconName: "delete"
             onTriggered: {
                 NotesStore.deleteNote(note.guid);
@@ -42,7 +42,7 @@
         }
         ToolbarSpacer {}
         ToolbarButton {
-            text: note.reminder ? "reminder (set)" : "reminder"
+            text: note.reminder ? "Reminder (set)" : "Reminder"
             iconName: "alarm-clock"
             onTriggered: {
                 note.reminder = !note.reminder
@@ -50,7 +50,7 @@
             }
         }
         ToolbarButton {
-            text: "edit"
+            text: i18n.tr("Edit")
             iconName: "edit"
             onTriggered: {
                 pagestack.pop()

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2014-01-28 08:43:55 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2014-01-28 08:43:55 +0000
@@ -33,7 +33,7 @@
 
     tools: ToolbarItems {
         ToolbarButton {
-            text: "search"
+            text: i18n.tr("Search")
             iconName: "search"
             onTriggered: {
                 pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
@@ -43,7 +43,7 @@
         ToolbarSpacer { }
 
         ToolbarButton {
-            text: "add notebook"
+            text: i18n.tr("Add notebook")
             iconName: "add"
             onTriggered: {
                 contentColumn.newNotebook = true;
@@ -101,7 +101,7 @@
             delegate: NotebooksDelegate {
                 name: model.name
                 noteCount: model.noteCount
-                shareStatus: model.publised ? i18n.tr("shared") : i18n.tr("private")
+                shareStatus: model.publised ? i18n.tr("Shared") : i18n.tr("Private")
 
                 onClicked: {
                     pagestack.push(Qt.resolvedUrl("NotesPage.qml"), {title: name, filter: guid});

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2014-01-28 08:43:55 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-01-28 08:43:55 +0000
@@ -36,7 +36,7 @@
     // Just for testing
     tools: ToolbarItems {
         ToolbarButton {
-            text: "search"
+            text: i18n.tr("Search")
             iconName: "search"
             onTriggered: {
                 pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
@@ -46,7 +46,7 @@
         ToolbarSpacer { }
 
         ToolbarButton {
-            text: "add note"
+            text: i18n.tr("Add note")
             iconName: "add"
             onTriggered: {
                 NotesStore.createNote("Untitled");

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2014-01-28 08:43:55 +0000
+++ src/app/qml/ui/RemindersPage.qml	2014-01-28 08:43:55 +0000
@@ -27,7 +27,7 @@
 
     tools: ToolbarItems {
         ToolbarButton {
-            text: "search"
+            text: i18n.tr("Search")
             iconName: "search"
             onTriggered: {
                 pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
@@ -37,7 +37,7 @@
         ToolbarSpacer { }
 
         ToolbarButton {
-            text: "add"
+            text: i18n.tr("Add reminder")
             iconName: "add"
             onTriggered: {
             }

=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	2014-01-28 08:43:55 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2014-01-28 08:43:55 +0000
@@ -49,7 +49,7 @@
             Button {
                 id: searchButton
                 height: searchField.height
-                text: "search"
+                text: i18n.tr("Search")
                 onClicked: {
                     NotesStore.findNotes(searchField.text + "*")
                 }