messaging-app

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

  1. messaging-app-desktop-translations
  2. Merge into trunk
Proposed by Ugo Riboni
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 119
Merged at revision: 147
Proposed branch: lp:~phablet-team/messaging-app/messaging-app-desktop-translations
Merge into: lp:messaging-app
Diff against target: 276 lines (+68/-65)
5 files modified
CMakeLists.txt (+3/-0)
po/CMakeLists.txt (+7/-3)
po/messaging-app.pot (+49/-51)
src/CMakeLists.txt (+5/-7)
src/messaging-app.desktop.in.in (+4/-4)
To merge this branch: bzr merge lp:~phablet-team/messaging-app/messaging-app-desktop-translations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Renato Araujo Oliveira Filho (community) Approve
Review via email: mp+223364@code.launchpad.net

Commit message

Add translations in .desktop files

Description of the change

Add translations in .desktop files

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
review: Needs Fixing
lp:~phablet-team/messaging-app/messaging-app-desktop-translations updated
119. By Renato Araujo Oliveira Filho

Removed useless code.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
5# Standard install paths5# Standard install paths
6include(GNUInstallDirs)6include(GNUInstallDirs)
77
8find_program(INTLTOOL_MERGE intltool-merge)
9find_program(INTLTOOL_EXTRACT intltool-extract)
10
8# Check for include files11# Check for include files
9include(CheckIncludeFileCXX)12include(CheckIncludeFileCXX)
10include(CheckIncludeFile)13include(CheckIncludeFile)
1114
=== 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 @@
88
9set(DOMAIN messaging-app)9set(DOMAIN messaging-app)
10set(POT_FILE ${DOMAIN}.pot)10set(POT_FILE ${DOMAIN}.pot)
11set(DESKTOP_FILE ${DOMAIN}.desktop)
11file(GLOB PO_FILES *.po)12file(GLOB PO_FILES *.po)
12file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}13file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
13 ${CMAKE_SOURCE_DIR}/src/*.desktop.in
14 ${CMAKE_SOURCE_DIR}/src/*.qml14 ${CMAKE_SOURCE_DIR}/src/*.qml
15 ${CMAKE_SOURCE_DIR}/src/*.js15 ${CMAKE_SOURCE_DIR}/src/*.js
16 ${CMAKE_SOURCE_DIR}/src/*.cpp16 ${CMAKE_SOURCE_DIR}/src/*.cpp
17)17)
18list(APPEND I18N_SRCS src/${DESKTOP_FILE}.in.in)
19list(SORT I18N_SRCS)
1820
19foreach(PO_FILE ${PO_FILES})21foreach(PO_FILE ${PO_FILES})
20 get_filename_component(LANG ${PO_FILE} NAME_WE)22 get_filename_component(LANG ${PO_FILE} NAME_WE)
@@ -27,8 +29,10 @@
2729
28find_program(XGETTEXT_EXECUTABLE xgettext)30find_program(XGETTEXT_EXECUTABLE xgettext)
29if(XGETTEXT_EXECUTABLE)31if(XGETTEXT_EXECUTABLE)
30 add_custom_target(${POT_FILE})32 add_custom_target(${POT_FILE} ALL
31 add_custom_command(TARGET ${POT_FILE}33 COMMENT "Generating translation template"
34 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
35 --srcdir=${CMAKE_SOURCE_DIR} src/${DESKTOP_FILE}.in.in
32 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}36 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}
33 )37 )
34 foreach(PO_FILE ${PO_FILES})38 foreach(PO_FILE ${PO_FILES})
3539
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-05-09 15:13-0300\n"11"POT-Creation-Date: 2014-06-17 11:13+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,13 +32,6 @@
32msgstr[0] ""32msgstr[0] ""
33msgstr[1] ""33msgstr[1] ""
3434
35#: src/qml/Messages.qml:61
36#, qt-format
37msgid "%1 other"
38msgid_plural "%1 others"
39msgstr[0] ""
40msgstr[1] ""
41
42#: src/qml/dateUtils.js:6635#: src/qml/dateUtils.js:66
43#, qt-format36#, qt-format
44msgid "%1 second call"37msgid "%1 second call"
@@ -46,107 +39,112 @@
46msgstr[0] ""39msgstr[0] ""
47msgstr[1] ""40msgstr[1] ""
4841
49#: src/qml/Messages.qml:28242#: src/qml/Messages.qml:409
50msgid "Add"43msgid "Add"
51msgstr ""44msgstr ""
5245
53#: src/qml/Messages.qml:24246#: src/qml/MultiRecipientInput.qml:145
54msgid "Add Contact"
55msgstr ""
56
57#: src/qml/MultiRecipientInput.qml:163
58msgid "Add contacts.."47msgid "Add contacts.."
59msgstr ""48msgstr ""
6049
61#: src/qml/MultiRecipientInput.qml:21750#: src/qml/NewRecipientPage.qml:27
62msgid "Add contacts..."51msgid "Add recipient"
63msgstr ""52msgstr ""
6453
65#: src/qml/Messages.qml:21454#: src/qml/AddPhoneNumberToContactPage.qml:26
66msgid "Add to contact"55msgid "Add to contact"
67msgstr ""56msgstr ""
6857
69#: src/qml/Messages.qml:169 src/qml/messaging-app.qml:8458#: src/qml/Messages.qml:152 src/qml/messaging-app.qml:137
70msgid "Add to existing contact"59msgid "Add to existing contact"
71msgstr ""60msgstr ""
7261
73#: src/qml/Messages.qml:30662#: src/qml/Messages.qml:397 src/qml/Messages.qml:426
74msgid "Call"63msgid "Call"
75msgstr ""64msgstr ""
7665
77#: src/qml/MessageDelegate.qml:91 src/qml/Messages.qml:18566#: src/qml/MainPage.qml:75 src/qml/MessageDelegate.qml:216
67#: src/qml/Messages.qml:169
78msgid "Cancel"68msgid "Cancel"
79msgstr ""69msgstr ""
8070
81#: src/qml/MainPage.qml:5171#: src/qml/MainPage.qml:31
82msgid "Compose"72msgid "Chats"
83msgstr ""73msgstr ""
8474
85#: src/qml/Messages.qml:29475#: src/qml/Messages.qml:438
86msgid "Contact"76msgid "Contact"
87msgstr ""77msgstr ""
8878
89#: src/qml/MessageDelegate.qml:5979#: src/qml/MessageDelegate.qml:176
90msgid "Copy"80msgid "Copy"
91msgstr ""81msgstr ""
9282
93#: src/qml/Messages.qml:177 src/qml/messaging-app.qml:8683#: src/qml/Messages.qml:161 src/qml/messaging-app.qml:139
94msgid "Create new contact"84msgid "Create new contact"
95msgstr ""85msgstr ""
9686
97#: src/qml/MainPage.qml:84 src/qml/Messages.qml:38687#: src/qml/MainPage.qml:31 src/qml/Messages.qml:58
98msgid "Delete"88msgid "Edit"
99msgstr ""89msgstr ""
10090
101#: src/qml/MessageDelegate.qml:21591#: src/qml/MessageDelegate.qml:300
102msgid "Failed"92msgid "Failed"
103msgstr ""93msgstr ""
10494
105#: src/qml/Messages.qml:16795#: src/qml/Messages.qml:74
96msgid "Group"
97msgstr ""
98
99#: src/qml/Messages.qml:150
106msgid "How do you want to save the contact?"100msgid "How do you want to save the contact?"
107msgstr ""101msgstr ""
108102
109#: src/qml/MainPage.qml:29103#: src/qml/MMS/PreviewerImage.qml:25
110msgid "Messages"104msgid "Image Preview"
111msgstr ""105msgstr ""
112106
113#: src/messaging-app.desktop.in:3107#: src/qml/MainPage.qml:39
114msgid "Messaging"108msgid "New Chat"
115msgstr ""109msgstr ""
116110
117#: src/messaging-app.desktop.in:4111#: src/qml/Messages.qml:77
118msgid "Messaging App"
119msgstr ""
120
121#: src/messaging-app.desktop.in:5
122msgid "Messaging application"
123msgstr ""
124
125#: src/qml/Messages.qml:64
126msgid "New Message"112msgid "New Message"
127msgstr ""113msgstr ""
128114
129#: src/qml/Messages.qml:166115#: src/qml/MMS/Previewer.qml:32 src/qml/MessageDelegate.qml:61
116msgid "Save"
117msgstr ""
118
119#: src/qml/Messages.qml:149
130msgid "Save contact"120msgid "Save contact"
131msgstr ""121msgstr ""
132122
133#: src/qml/MainPage.qml:42 src/qml/Messages.qml:273123#: src/qml/MessageDelegate.qml:75 src/qml/MessageDelegate.qml:184
134msgid "Select"124msgid "Select"
135msgstr ""125msgstr ""
136126
137#: src/qml/MessageDelegate.qml:213127#: src/qml/MessageDelegate.qml:298
138msgid "Sending..."128msgid "Sending..."
139msgstr ""129msgstr ""
140130
131#: src/qml/MMS/Previewer.qml:45 src/qml/MessageDelegate.qml:68
132msgid "Share"
133msgstr ""
134
141#: src/qml/dateUtils.js:41135#: src/qml/dateUtils.js:41
142msgid "Today"136msgid "Today"
143msgstr ""137msgstr ""
144138
145#: src/qml/MessageDelegate.qml:83139#: src/qml/MessageDelegate.qml:208
146msgid "Try again"140msgid "Try again"
147msgstr ""141msgstr ""
148142
149#: src/qml/Messages.qml:474143#: src/qml/MMS/PreviewerVideo.qml:25
144msgid "Video Preview"
145msgstr ""
146
147#: src/qml/Messages.qml:578
150msgid "Write a message..."148msgid "Write a message..."
151msgstr ""149msgstr ""
152150
153151
=== 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 @@
2525
26# Handle i18n in the desktop file26# Handle i18n in the desktop file
27set(DESKTOP_FILE ${MESSAGING_APP}.desktop)27set(DESKTOP_FILE ${MESSAGING_APP}.desktop)
28file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})28configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
29file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)29add_custom_target(${DESKTOP_FILE} ALL
30foreach(LINE ${DESKTOP_FILE_CONTENTS})30 COMMENT "Merging translations into ${DESKTOP_FILE}"
31 string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")31 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
32 string(CONFIGURE "${LINE}" LINE)32 )
33 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
34endforeach(LINE)
3533
36install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}34install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
37 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications35 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
3836
=== 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 @@
1[Desktop Entry]1[Desktop Entry]
2Type=Application2Type=Application
3Name=tr("Messaging")3_Name=Messaging
4GenericName=tr("Messaging App")4_GenericName=Messaging App
5Comment=tr("Messaging application")5_Comment=Messaging application
6_Keywords=Messages;SMS;MMS;Text Messages;Text
6Exec=messaging-app %u7Exec=messaging-app %u
7Terminal=false8Terminal=false
8Icon=messaging-app9Icon=messaging-app
9MimeType=x-scheme-handler/contact;x-scheme-handler/call10MimeType=x-scheme-handler/contact;x-scheme-handler/call
10X-Ubuntu-Touch=true11X-Ubuntu-Touch=true
11X-Ubuntu-StageHint=SideStage12X-Ubuntu-StageHint=SideStage
12X-Ubuntu-Gettext-Domain=messaging-app
13X-Ubuntu-Single-Instance=true13X-Ubuntu-Single-Instance=true
14X-Screenshot=@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/assets/messaging-app-screenshot.png14X-Screenshot=@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/assets/messaging-app-screenshot.png

Subscribers

People subscribed via source and target branches

to all changes: