dialer-app

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

  1. dialer-app-desktop-translations
  2. Merge into trunk
Proposed by Ugo Riboni
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 153
Merged at revision: 178
Proposed branch: lp:~phablet-team/dialer-app/dialer-app-desktop-translations
Merge into: lp:dialer-app
Diff against target: 227 lines (+37/-43)
5 files modified
CMakeLists.txt (+4/-0)
po/CMakeLists.txt (+8/-4)
po/dialer-app.pot (+15/-27)
src/CMakeLists.txt (+6/-8)
src/dialer-app.desktop.in.in (+4/-4)
To merge this branch: bzr merge lp:~phablet-team/dialer-app/dialer-app-desktop-translations
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+223365@code.launchpad.net

Commit message

Add translations inside .desktop files

Description of the change

Add translations inside .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:153
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/933
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/849/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1685
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1685/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8517
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/740/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/989
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/989/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-01-23 13:03:48 +0000
3+++ CMakeLists.txt 2014-06-17 09:16:25 +0000
4@@ -1,10 +1,14 @@
5 project(dialer-app)
6 cmake_minimum_required(VERSION 2.8)
7 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
8+set(DESKTOP_FILE dialer-app.desktop)
9
10 # Standard install paths
11 include(GNUInstallDirs)
12
13+find_program(INTLTOOL_MERGE intltool-merge)
14+find_program(INTLTOOL_EXTRACT intltool-extract)
15+
16 # Check for include files
17 include(CheckIncludeFileCXX)
18 include(CheckIncludeFile)
19
20=== modified file 'po/CMakeLists.txt'
21--- po/CMakeLists.txt 2013-07-16 14:05:40 +0000
22+++ po/CMakeLists.txt 2014-06-17 09:16:25 +0000
23@@ -10,11 +10,11 @@
24 set(POT_FILE ${DOMAIN}.pot)
25 file(GLOB PO_FILES *.po)
26 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
27- ${CMAKE_SOURCE_DIR}/src/*.desktop.in
28 ${CMAKE_SOURCE_DIR}/src/*.qml
29 ${CMAKE_SOURCE_DIR}/src/*.js
30 ${CMAKE_SOURCE_DIR}/src/*.cpp
31 )
32+list(APPEND I18N_SRCS src/${DESKTOP_FILE}.in.in)
33
34 foreach(PO_FILE ${PO_FILES})
35 get_filename_component(LANG ${PO_FILE} NAME_WE)
36@@ -27,10 +27,14 @@
37
38 find_program(XGETTEXT_EXECUTABLE xgettext)
39 if(XGETTEXT_EXECUTABLE)
40- add_custom_target(${POT_FILE})
41- add_custom_command(TARGET ${POT_FILE}
42- 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}
43+ add_custom_target(${POT_FILE} ALL
44+ COMMENT "Generating translation template"
45+ COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
46+ --srcdir=${CMAKE_SOURCE_DIR} src/${DESKTOP_FILE}.in.in
47+
48+ 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}
49 )
50+
51 foreach(PO_FILE ${PO_FILES})
52 add_custom_command(TARGET ${POT_FILE}
53 COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} ${PO_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${POT_FILE} -o ${PO_FILE}
54
55=== modified file 'po/dialer-app.pot'
56--- po/dialer-app.pot 2014-05-09 18:20:23 +0000
57+++ po/dialer-app.pot 2014-06-17 09:16:25 +0000
58@@ -8,7 +8,7 @@
59 msgstr ""
60 "Project-Id-Version: PACKAGE VERSION\n"
61 "Report-Msgid-Bugs-To: \n"
62-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
63+"POT-Creation-Date: 2014-06-16 19:26+0200\n"
64 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
65 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
66 "Language-Team: LANGUAGE <LL@li.org>\n"
67@@ -103,15 +103,15 @@
68 msgid "Add to existing contact"
69 msgstr ""
70
71-#: src/qml/dialer-app.qml:207
72+#: src/qml/dialer-app.qml:244
73 msgid "Call Barring"
74 msgstr ""
75
76-#: src/qml/dialer-app.qml:218
77+#: src/qml/dialer-app.qml:255
78 msgid "Call Forwarding"
79 msgstr ""
80
81-#: src/qml/dialer-app.qml:229
82+#: src/qml/dialer-app.qml:266
83 msgid "Call Waiting"
84 msgstr ""
85
86@@ -123,11 +123,11 @@
87 msgid "Call now"
88 msgstr ""
89
90-#: src/qml/dialer-app.qml:240
91+#: src/qml/dialer-app.qml:277
92 msgid "Calling Line Presentation"
93 msgstr ""
94
95-#: src/qml/dialer-app.qml:252
96+#: src/qml/dialer-app.qml:289
97 msgid "Calling Line Restriction"
98 msgstr ""
99
100@@ -135,16 +135,16 @@
101 msgid "Cancel"
102 msgstr ""
103
104+#: src/qml/LiveCallPage/MultiCallDisplay.qml:114
105 #: src/qml/LiveCallPage/LiveCall.qml:49
106-#: src/qml/LiveCallPage/MultiCallDisplay.qml:114
107 msgid "Conference"
108 msgstr ""
109
110-#: src/qml/dialer-app.qml:246
111+#: src/qml/dialer-app.qml:283
112 msgid "Connected Line Presentation"
113 msgstr ""
114
115-#: src/qml/dialer-app.qml:258
116+#: src/qml/dialer-app.qml:295
117 msgid "Connected Line Restriction"
118 msgstr ""
119
120@@ -164,27 +164,15 @@
121 msgid "Delete"
122 msgstr ""
123
124-#: src/dialer-app.desktop.in:3
125-msgid "Dialer"
126-msgstr ""
127-
128-#: src/dialer-app.desktop.in:4
129-msgid "Dialer App"
130-msgstr ""
131-
132-#: src/dialer-app.desktop.in:5
133-msgid "Dialer application"
134-msgstr ""
135-
136-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
137+#: src/qml/dialer-app.qml:169 src/qml/dialer-app.qml:183
138 msgid "Dismiss"
139 msgstr ""
140
141-#: src/qml/DialerPage/DialerPage.qml:79
142+#: src/qml/DialerPage/DialerPage.qml:89
143 msgid "Enter a number"
144 msgstr ""
145
146-#: src/qml/dialer-app.qml:140
147+#: src/qml/dialer-app.qml:166
148 msgid "Error"
149 msgstr ""
150
151@@ -200,7 +188,7 @@
152 msgid "How do you want to save the contact?"
153 msgstr ""
154
155-#: src/qml/dialer-app.qml:141
156+#: src/qml/dialer-app.qml:167
157 msgid "Invalid USSD code"
158 msgstr ""
159
160@@ -228,7 +216,7 @@
161 msgid "PQRS"
162 msgstr ""
163
164-#: src/qml/dialer-app.qml:121
165+#: src/qml/dialer-app.qml:147
166 msgid "Please wait"
167 msgstr ""
168
169@@ -282,8 +270,8 @@
170 msgid "active"
171 msgstr ""
172
173+#: src/qml/LiveCallPage/MultiCallDisplay.qml:134
174 #: src/qml/LiveCallPage/LiveCall.qml:409
175-#: src/qml/LiveCallPage/MultiCallDisplay.qml:134
176 msgid "calling"
177 msgstr ""
178
179
180=== modified file 'src/CMakeLists.txt'
181--- src/CMakeLists.txt 2014-05-28 20:27:06 +0000
182+++ src/CMakeLists.txt 2014-06-17 09:16:25 +0000
183@@ -23,15 +23,13 @@
184 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
185 )
186
187+
188 # Handle i18n in the desktop file
189-set(DESKTOP_FILE ${DIALER_APP}.desktop)
190-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
191-file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
192-foreach(LINE ${DESKTOP_FILE_CONTENTS})
193- string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
194- string(CONFIGURE "${LINE}" LINE)
195- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
196-endforeach(LINE)
197+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
198+add_custom_target(${DESKTOP_FILE} ALL
199+ COMMENT "Merging translations into ${DESKTOP_FILE}"
200+ COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
201+ )
202
203 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
204 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
205
206=== renamed file 'src/dialer-app.desktop.in' => 'src/dialer-app.desktop.in.in'
207--- src/dialer-app.desktop.in 2013-10-09 19:52:11 +0000
208+++ src/dialer-app.desktop.in.in 2014-06-17 09:16:25 +0000
209@@ -1,14 +1,14 @@
210 [Desktop Entry]
211 Type=Application
212-Name=tr("Dialer")
213-GenericName=tr("Dialer App")
214-Comment=tr("Dialer application")
215+_Name=Dialer
216+_GenericName=Dialer App
217+_Comment=Dialer application
218+_Keywords=Dialer;Dial;Call;Keypad
219 Exec=dialer-app %u
220 Terminal=false
221 Icon=phone-app
222 MimeType=x-scheme-handler/contact;x-scheme-handler/call
223 X-Ubuntu-Touch=true
224 X-Ubuntu-StageHint=SideStage
225-X-Ubuntu-Gettext-Domain=dialer-app
226 X-Ubuntu-Single-Instance=true
227 X-Screenshot=@CMAKE_INSTALL_PREFIX@/@DIALER_APP_DIR@/assets/dialer-app-screenshot.png

Subscribers

People subscribed via source and target branches