Merge lp:~dpm/reminders-app/desktop-i18n into lp:reminders-app

[David Planella]

Added .desktop file internationalization

Added .desktop file internationalization

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

PASSED: Continuous integration, rev:260
http://91.189.93.70:8080/job/reminders-app-ci/531/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/579
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/579/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/227

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-01-30 13:45:37 +0000
+++ .bzrignore	2014-09-28 09:12:09 +0000
@@ -11,3 +11,5 @@
 obj-*/
 reminders-app.qmlproject.user
 reminders-app.pro.user
+*.desktop.in
+*.desktop.in.in.h

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-08 15:39:00 +0000
+++ CMakeLists.txt	2014-09-28 09:12:09 +0000
@@ -1,5 +1,7 @@
 project(com.ubuntu.reminders C CXX)
 cmake_minimum_required(VERSION 2.8.9)
+find_program(INTLTOOL_MERGE intltool-merge)
+find_program(INTLTOOL_EXTRACT intltool-extract)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
@@ -72,7 +74,8 @@
 
 file(GLOB_RECURSE I18N_SRC_FILES
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    src/app/qml/*.qml *.desktop.in)
+    *.qml *.js *.cpp *.h)
+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
 list(SORT I18N_SRC_FILES)
 
 file(GLOB SRC_FILES
@@ -80,7 +83,12 @@
     *.qml *.js *.png *.js)
 install(FILES ${SRC_FILES}  DESTINATION ${DATA_DIR})
 
-configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
+configure_file(${DESKTOP_FILE}.in.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in)
+
+add_custom_target(${DESKTOP_FILE} ALL
+    COMMENT "Merging translations into ${DESKTOP_FILE}"
+    COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} > /dev/null
+)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
 
 configure_file(${APPLICATION_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_FILE})

=== modified file 'README.translations'
--- README.translations	2013-11-20 21:47:27 +0000
+++ README.translations	2014-09-28 09:12:09 +0000
@@ -10,10 +10,9 @@
 translatable messages to translators. So whenever you add new translatable
 messages in the code, make sure to follow these steps:
 
- 1. Change directory to the po/ folder: `cd po`
- 2. Update the translations template: `qmake && make pot`
- 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
- 4. Push the branch and send a merge proposal as usual
+ 1. Run click-buddy retaining the build directory:
+    `click-buddy --dir . --no-clean`
+ 2. Commit and push the branch and send a merge proposal as usual
 
 And that's it, once the branch lands Launchpad should take care of all the rest!
 

=== renamed file 'com.ubuntu.reminders.desktop.in' => 'com.ubuntu.reminders.desktop.in.in'
--- com.ubuntu.reminders.desktop.in	2014-07-21 14:47:58 +0000
+++ com.ubuntu.reminders.desktop.in.in	2014-09-28 09:12:09 +0000
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Name=Reminders
-Comment=Ubuntu Reminders app, powered by Evernote
+_Name=Reminders
+_Comment=Ubuntu Reminders app, powered by Evernote
 Exec=@EXEC@
 Icon=@ICON@
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
-X-Ubuntu-Gettext-Domain=@PROJECT_NAME@
 X-Ubuntu-Default-Department-ID=accessories

=== modified file 'debian/control'
--- debian/control	2014-09-09 16:27:03 +0000
+++ debian/control	2014-09-28 09:12:09 +0000
@@ -5,6 +5,7 @@
                debhelper (>= 9),
                dh-exec,
                gettext,
+               intltool,
                libboost-dev,
                libssl-dev,
                python3-all,

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-01-28 08:31:37 +0000
+++ po/CMakeLists.txt	2014-09-28 09:12:09 +0000
@@ -5,15 +5,19 @@
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 
-add_custom_target(${POT_FILE}
-                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
-                          -D ${CMAKE_SOURCE_DIR}
-                          --from-code=UTF-8
-                          --c++ --qt --add-comments=TRANSLATORS
-                          --keyword=tr --keyword=tr:1,2
-                          --package-name='${PROJECT}'
-                          --copyright-holder='Canonical Ltd.'
-                          ${I18N_SRC_FILES})
+add_custom_target(${POT_FILE} ALL
+    COMMENT "Generating translation template"
+    COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+        --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
+    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+        --from-code=UTF-8
+        --c++ --qt --add-comments=TRANSLATORS
+        --keyword=tr --keyword=tr:1,2 --keyword=N_
+        --package-name='${PROJECT}'
+        --copyright-holder='Canonical Ltd.'
+        -D ${CMAKE_SOURCE_DIR} ${I18N_SRC_FILES}
+        -D ${CMAKE_CURRENT_BINARY_DIR} ${DESKTOP_FILE}.in.in.h
+   COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)

=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot	2014-08-29 12:56:52 +0000
+++ po/com.ubuntu.reminders.pot	2014-09-28 09:12:09 +0000
@@ -1,14 +1,14 @@
-# reminders-app translations
-# Copyright (C) 2014 Canonical Ltd.
-# This file is distributed under the same license as the reminders-app package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR 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: com.ubuntu.reminders\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-29 14:53+0200\n"
+"POT-Creation-Date: 2014-09-28 11:05+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,243 +17,244 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/app/qml/reminders.qml:205
-msgid "Notes"
-msgstr ""
-
-#: ../src/app/qml/reminders.qml:234
-msgid "Notebooks"
-msgstr ""
-
-#: ../src/app/qml/reminders.qml:262
-#: ../.build/com.ubuntu.reminders.desktop.js:1
+#: com.ubuntu.reminders.desktop.in.in.h:1 src/app/qml/reminders.qml:266
 msgid "Reminders"
 msgstr ""
 
-#: ../src/app/qml/reminders.qml:282
-msgid ""
-"No note selected.\n"
-"Select a note to see it in detail."
-msgstr ""
-
-#: ../src/app/qml/reminders.qml:319
-msgid "No account available"
-msgstr ""
-
-#: ../src/app/qml/reminders.qml:320
-msgid "Please configure and authorize an Evernote account in System Settings"
-msgstr ""
-
-#: ../src/app/qml/reminders.qml:340
-#: ../src/app/qml/ui/AccountSelectorPage.qml:63
-msgid "Add account"
-msgstr ""
-
-#: ../src/app/qml/components/NotebooksDelegate.qml:68
+#: com.ubuntu.reminders.desktop.in.in.h:2
+msgid "Ubuntu Reminders app, powered by Evernote"
+msgstr ""
+
+#: src/app/qml/components/NotebooksDelegate.qml:98
 #, qt-format
 msgid "Last edited %1"
 msgstr ""
 
-#: ../src/app/qml/components/NotebooksDelegate.qml:75
+#: src/app/qml/components/NotebooksDelegate.qml:105
 msgid "Shared"
 msgstr ""
 
-#: ../src/app/qml/components/NotebooksDelegate.qml:75
+#: src/app/qml/components/NotebooksDelegate.qml:105
 msgid "Private"
 msgstr ""
 
-#: ../src/app/qml/components/PulldownListView.qml:40
+#: src/app/qml/components/PulldownListView.qml:40
 msgid "Release to refresh"
 msgstr ""
 
-#: ../src/app/qml/components/PulldownListView.qml:40
+#: 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
+#: src/app/qml/components/RemindersDelegate.qml:50
+#: src/app/qml/ui/SetReminderView.qml:55
 msgid "Clear reminder"
 msgstr ""
 
-#: ../src/app/qml/components/RemindersDelegate.qml:50
+#: src/app/qml/components/RemindersDelegate.qml:50
 msgid "Mark as done"
 msgstr ""
 
-#: ../src/app/qml/ui/AccountSelectorPage.qml:29
+#: src/app/qml/reminders.qml:205
+msgid "Notes"
+msgstr ""
+
+#: src/app/qml/reminders.qml:236
+msgid "Notebooks"
+msgstr ""
+
+#: src/app/qml/reminders.qml:286
+msgid ""
+"No note selected.\n"
+"Select a note to see it in detail."
+msgstr ""
+
+#: src/app/qml/reminders.qml:323
+msgid "No account available"
+msgstr ""
+
+#: src/app/qml/reminders.qml:324
+msgid "Please configure and authorize an Evernote account in System Settings"
+msgstr ""
+
+#: src/app/qml/reminders.qml:344 src/app/qml/ui/AccountSelectorPage.qml:63
+msgid "Add account"
+msgstr ""
+
+#: src/app/qml/ui/AccountSelectorPage.qml:29
 msgid "Select Evernote account"
 msgstr ""
 
-#: ../src/app/qml/ui/EditNoteView.qml:98
-#: ../src/app/qml/ui/EditNoteView.qml:110 ../src/app/qml/ui/NotesPage.qml:48
+#: src/app/qml/ui/EditNoteView.qml:100 src/app/qml/ui/EditNoteView.qml:112
+#: src/app/qml/ui/NotesPage.qml:70
 msgid "Untitled"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:34 ../src/app/qml/ui/NotesPage.qml:112
+#: src/app/qml/ui/NotePage.qml:34 src/app/qml/ui/NotesPage.qml:134
 msgid "Edit"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:43 ../src/app/qml/ui/NotesPage.qml:96
+#: src/app/qml/ui/NotePage.qml:43 src/app/qml/ui/NotesPage.qml:118
 msgid "Edit reminder"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:43 ../src/app/qml/ui/NotesPage.qml:96
-#: ../src/app/qml/ui/SetReminderView.qml:66
+#: src/app/qml/ui/NotePage.qml:43 src/app/qml/ui/NotesPage.qml:118
+#: src/app/qml/ui/SetReminderView.qml:66
 msgid "Set reminder"
 msgstr ""
 
-#: ../src/app/qml/ui/NotePage.qml:57 ../src/app/qml/ui/NotesPage.qml:86
+#: src/app/qml/ui/NotePage.qml:57 src/app/qml/ui/NotesPage.qml:108
 msgid "Delete"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:41
+#: src/app/qml/ui/NotebooksPage.qml:43
 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
+#: src/app/qml/ui/NotebooksPage.qml:53 src/app/qml/ui/NotesPage.qml:77
+#: src/app/qml/ui/RemindersPage.qml:34 src/app/qml/ui/SearchNotesPage.qml:58
 msgid "Search"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:61 ../src/app/qml/ui/NotesPage.qml:65
+#: src/app/qml/ui/NotebooksPage.qml:63 src/app/qml/ui/NotesPage.qml:87
 msgid "Refresh"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:71 ../src/app/qml/ui/NotesPage.qml:75
-#: ../src/app/qml/ui/RemindersPage.qml:44
+#: src/app/qml/ui/NotebooksPage.qml:73 src/app/qml/ui/NotesPage.qml:97
+#: src/app/qml/ui/RemindersPage.qml:44
 msgid "Accounts"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:173
+#: src/app/qml/ui/NotebooksPage.qml:175
 msgid "Cancel"
 msgstr ""
 
-#: ../src/app/qml/ui/NotebooksPage.qml:182
+#: src/app/qml/ui/NotebooksPage.qml:184
 msgid "Save"
 msgstr ""
 
-#: ../src/app/qml/ui/NotesPage.qml:45
+#: src/app/qml/ui/NotesPage.qml:39 src/app/qml/ui/NotesPage.qml:67
 msgid "Add note"
 msgstr ""
 
-#: ../src/app/qml/ui/NotesPage.qml:185
+#: src/app/qml/ui/NotesPage.qml:207
 msgid ""
 "No notes available. You can create new notes using the \"Add note\" button."
 msgstr ""
 
-#: ../src/app/qml/ui/RemindersPage.qml:108
+#: src/app/qml/ui/RemindersPage.qml:108
 msgid ""
 "No reminders available. You can create new reminders by setting a reminder "
 "when viewing a note."
 msgstr ""
 
-#: ../src/app/qml/ui/SearchNotesPage.qml:30
+#: src/app/qml/ui/SearchNotesPage.qml:30
 msgid "Search notes"
 msgstr ""
 
-#: ../src/app/qml/ui/SetReminderView.qml:36
+#: 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:240
+#: src/plugin/Evernote/jobs/evernotejob.cpp:91
+msgid "Authentication expired."
+msgstr ""
+
+#: src/plugin/Evernote/jobs/evernotejob.cpp:95
+msgid "Limit exceeded."
+msgstr ""
+
+#: src/plugin/Evernote/jobs/evernotejob.cpp:99
+msgid "Rate limit exceeded."
+msgstr ""
+
+#: src/plugin/Evernote/jobs/evernotejob.cpp:103
+msgid "Quota exceeded."
+msgstr ""
+
+#: src/plugin/Evernote/note.cpp:82 src/plugin/Evernote/note.cpp:247
 msgid "Today"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:85
+#: src/plugin/Evernote/note.cpp:85
 msgid "Yesterday"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:88
+#: src/plugin/Evernote/note.cpp:88
 msgid "Last week"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:91
+#: src/plugin/Evernote/note.cpp:91
 msgid "Two weeks ago"
 msgstr ""
 
 #. TRANSLATORS: the first argument refers to a month name and the second to a year
-#: ../src/plugin/Evernote/note.cpp:95
+#: src/plugin/Evernote/note.cpp:95
 #, qt-format
 msgid "%1 %2"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:228
+#: src/plugin/Evernote/note.cpp:235
 msgid "Done"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:234
+#: src/plugin/Evernote/note.cpp:241
 msgid "No date"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:237
+#: src/plugin/Evernote/note.cpp:244
 msgid "Overdue"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:243
+#: src/plugin/Evernote/note.cpp:250
 msgid "Tomorrow"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:246
+#: src/plugin/Evernote/note.cpp:253
 msgid "Next week"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:249
+#: src/plugin/Evernote/note.cpp:256
 msgid "In two weeks"
 msgstr ""
 
-#: ../src/plugin/Evernote/note.cpp:251
+#: src/plugin/Evernote/note.cpp:258
 msgid "Later"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: today"
-#: ../src/plugin/Evernote/notebook.cpp:100
+#: 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:104
+#: 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:108
+#: 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:112
+#: 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:116
+#: src/plugin/Evernote/notebook.cpp:116
 #, qt-format
 msgid "on %1 %2"
 msgstr ""
 
-#: ../src/plugin/Evernote/notesstore.cpp:223
+#: src/plugin/Evernote/notesstore.cpp:239
 #, qt-format
 msgid "Error refreshing notes: %1"
 msgstr ""
 
-#: ../src/plugin/Evernote/notesstore.cpp:375
+#: src/plugin/Evernote/notesstore.cpp:391
 #, 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 ""