Merge lp:~phablet-team/messaging-app/messaging-app-desktop-translations into lp:messaging-app

[Ugo Riboni]

Add translations in .desktop files

Add translations in .desktop files

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/931
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/847/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1683
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1683/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8516
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/739/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/987
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/987/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/228/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

review: Needs Fixing

[lp:~phablet-team/messaging-app/messaging-app-desktop-translations]

119. By Renato Araujo Oliveira Filho on 2014-07-16

Removed useless code.

[Renato Araujo Oliveira Filho (renatofilho)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3215
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1954
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1954/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/293/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-01 18:08:32 +0000
+++ CMakeLists.txt	2014-07-16 12:41:29 +0000
@@ -5,6 +5,9 @@
 # Standard install paths
 include(GNUInstallDirs)
 
+find_program(INTLTOOL_MERGE intltool-merge)
+find_program(INTLTOOL_EXTRACT intltool-extract)
+
 # Check for include files
 include(CheckIncludeFileCXX)
 include(CheckIncludeFile)

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2013-07-15 20:33:33 +0000
+++ po/CMakeLists.txt	2014-07-16 12:41:29 +0000
@@ -8,13 +8,15 @@
 
 set(DOMAIN messaging-app)
 set(POT_FILE ${DOMAIN}.pot)
+set(DESKTOP_FILE ${DOMAIN}.desktop)
 file(GLOB PO_FILES *.po)
 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/*.desktop.in
     ${CMAKE_SOURCE_DIR}/src/*.qml
     ${CMAKE_SOURCE_DIR}/src/*.js
     ${CMAKE_SOURCE_DIR}/src/*.cpp
 )
+list(APPEND I18N_SRCS src/${DESKTOP_FILE}.in.in)
+list(SORT I18N_SRCS)
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)
@@ -27,8 +29,10 @@
 
 find_program(XGETTEXT_EXECUTABLE xgettext)
 if(XGETTEXT_EXECUTABLE)
-    add_custom_target(${POT_FILE})
-    add_custom_command(TARGET ${POT_FILE}
+    add_custom_target(${POT_FILE} ALL
+        COMMENT "Generating translation template"
+        COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+                --srcdir=${CMAKE_SOURCE_DIR} src/${DESKTOP_FILE}.in.in
         COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o ${POT_FILE} ${I18N_SRCS}
     )
     foreach(PO_FILE ${PO_FILES})

=== modified file 'po/messaging-app.pot'
--- po/messaging-app.pot	2014-05-09 18:14:10 +0000
+++ po/messaging-app.pot	2014-07-16 12:41:29 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-09 15:13-0300\n"
+"POT-Creation-Date: 2014-06-17 11:13+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"
@@ -32,13 +32,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/Messages.qml:61
-#, qt-format
-msgid "%1 other"
-msgid_plural "%1 others"
-msgstr[0] ""
-msgstr[1] ""
-
 #: src/qml/dateUtils.js:66
 #, qt-format
 msgid "%1 second call"
@@ -46,107 +39,112 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/Messages.qml:282
+#: src/qml/Messages.qml:409
 msgid "Add"
 msgstr ""
 
-#: src/qml/Messages.qml:242
-msgid "Add Contact"
-msgstr ""
-
-#: src/qml/MultiRecipientInput.qml:163
+#: src/qml/MultiRecipientInput.qml:145
 msgid "Add contacts.."
 msgstr ""
 
-#: src/qml/MultiRecipientInput.qml:217
-msgid "Add contacts..."
+#: src/qml/NewRecipientPage.qml:27
+msgid "Add recipient"
 msgstr ""
 
-#: src/qml/Messages.qml:214
+#: src/qml/AddPhoneNumberToContactPage.qml:26
 msgid "Add to contact"
 msgstr ""
 
-#: src/qml/Messages.qml:169 src/qml/messaging-app.qml:84
+#: src/qml/Messages.qml:152 src/qml/messaging-app.qml:137
 msgid "Add to existing contact"
 msgstr ""
 
-#: src/qml/Messages.qml:306
+#: src/qml/Messages.qml:397 src/qml/Messages.qml:426
 msgid "Call"
 msgstr ""
 
-#: src/qml/MessageDelegate.qml:91 src/qml/Messages.qml:185
+#: src/qml/MainPage.qml:75 src/qml/MessageDelegate.qml:216
+#: src/qml/Messages.qml:169
 msgid "Cancel"
 msgstr ""
 
-#: src/qml/MainPage.qml:51
-msgid "Compose"
+#: src/qml/MainPage.qml:31
+msgid "Chats"
 msgstr ""
 
-#: src/qml/Messages.qml:294
+#: src/qml/Messages.qml:438
 msgid "Contact"
 msgstr ""
 
-#: src/qml/MessageDelegate.qml:59
+#: src/qml/MessageDelegate.qml:176
 msgid "Copy"
 msgstr ""
 
-#: src/qml/Messages.qml:177 src/qml/messaging-app.qml:86
+#: src/qml/Messages.qml:161 src/qml/messaging-app.qml:139
 msgid "Create new contact"
 msgstr ""
 
-#: src/qml/MainPage.qml:84 src/qml/Messages.qml:386
-msgid "Delete"
+#: src/qml/MainPage.qml:31 src/qml/Messages.qml:58
+msgid "Edit"
 msgstr ""
 
-#: src/qml/MessageDelegate.qml:215
+#: src/qml/MessageDelegate.qml:300
 msgid "Failed"
 msgstr ""
 
-#: src/qml/Messages.qml:167
+#: src/qml/Messages.qml:74
+msgid "Group"
+msgstr ""
+
+#: src/qml/Messages.qml:150
 msgid "How do you want to save the contact?"
 msgstr ""
 
-#: src/qml/MainPage.qml:29
-msgid "Messages"
-msgstr ""
-
-#: src/messaging-app.desktop.in:3
-msgid "Messaging"
-msgstr ""
-
-#: src/messaging-app.desktop.in:4
-msgid "Messaging App"
-msgstr ""
-
-#: src/messaging-app.desktop.in:5
-msgid "Messaging application"
-msgstr ""
-
-#: src/qml/Messages.qml:64
+#: src/qml/MMS/PreviewerImage.qml:25
+msgid "Image Preview"
+msgstr ""
+
+#: src/qml/MainPage.qml:39
+msgid "New Chat"
+msgstr ""
+
+#: src/qml/Messages.qml:77
 msgid "New Message"
 msgstr ""
 
-#: src/qml/Messages.qml:166
+#: src/qml/MMS/Previewer.qml:32 src/qml/MessageDelegate.qml:61
+msgid "Save"
+msgstr ""
+
+#: src/qml/Messages.qml:149
 msgid "Save contact"
 msgstr ""
 
-#: src/qml/MainPage.qml:42 src/qml/Messages.qml:273
+#: src/qml/MessageDelegate.qml:75 src/qml/MessageDelegate.qml:184
 msgid "Select"
 msgstr ""
 
-#: src/qml/MessageDelegate.qml:213
+#: src/qml/MessageDelegate.qml:298
 msgid "Sending..."
 msgstr ""
 
+#: src/qml/MMS/Previewer.qml:45 src/qml/MessageDelegate.qml:68
+msgid "Share"
+msgstr ""
+
 #: src/qml/dateUtils.js:41
 msgid "Today"
 msgstr ""
 
-#: src/qml/MessageDelegate.qml:83
+#: src/qml/MessageDelegate.qml:208
 msgid "Try again"
 msgstr ""
 
-#: src/qml/Messages.qml:474
+#: src/qml/MMS/PreviewerVideo.qml:25
+msgid "Video Preview"
+msgstr ""
+
+#: src/qml/Messages.qml:578
 msgid "Write a message..."
 msgstr ""
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-07-01 18:08:32 +0000
+++ src/CMakeLists.txt	2014-07-16 12:41:29 +0000
@@ -25,13 +25,11 @@
 
 # Handle i18n in the desktop file
 set(DESKTOP_FILE ${MESSAGING_APP}.desktop)
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
-file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
-foreach(LINE ${DESKTOP_FILE_CONTENTS})
-    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
-    string(CONFIGURE "${LINE}" LINE)
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
-endforeach(LINE)
+configure_file(${DESKTOP_FILE}.in.in ${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 ${CMAKE_INSTALL_DATADIR}/applications

=== renamed file 'src/messaging-app.desktop.in' => 'src/messaging-app.desktop.in.in'
--- src/messaging-app.desktop.in	2014-06-24 13:57:22 +0000
+++ src/messaging-app.desktop.in.in	2014-07-16 12:41:29 +0000
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Type=Application
-Name=tr("Messaging")
-GenericName=tr("Messaging App")
-Comment=tr("Messaging application")
+_Name=Messaging
+_GenericName=Messaging App
+_Comment=Messaging application
+_Keywords=Messages;SMS;MMS;Text Messages;Text
 Exec=messaging-app %u
 Terminal=false
 Icon=messaging-app
 MimeType=x-scheme-handler/contact;x-scheme-handler/call
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=messaging-app
 X-Ubuntu-Single-Instance=true
 X-Screenshot=@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/assets/messaging-app-screenshot.png