Merge lp:~dpm/ubuntu-rssreader-app/desktop-i18n into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
- desktop-i18n
- Merge into trunk
Proposed by
David Planella
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Joey Chan | ||||
Approved revision: | 315 | ||||
Merged at revision: | 313 | ||||
Proposed branch: | lp:~dpm/ubuntu-rssreader-app/desktop-i18n | ||||
Merge into: | lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk | ||||
Diff against target: |
589 lines (+142/-255) 9 files modified
.bzrignore (+1/-1) CMakeLists.txt (+12/-5) README.translations (+3/-4) com.ubuntu.shorts_shorts.desktop.in.in (+2/-2) debian/control (+1/-0) po/CMakeLists.txt (+14/-9) po/com.ubuntu.shorts.pot (+109/-113) po/po.pro (+0/-58) po/po.pro.user (+0/-63) |
||||
To merge this branch: | bzr merge lp:~dpm/ubuntu-rssreader-app/desktop-i18n | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Ubuntu Shorts Developers | Pending | ||
Review via email: mp+235216@code.launchpad.net |
Commit message
Added translation support to the .desktop file
Description of the change
Added translation support to the .desktop file
To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
- 315. By David Planella
-
Added .deb dependency on intltool
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:315
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2014-04-03 02:46:38 +0000 |
3 | +++ .bzrignore 2014-09-18 21:37:28 +0000 |
4 | @@ -1,4 +1,4 @@ |
5 | -*.qmlproject.user |
6 | +*.user |
7 | |
8 | debian/files |
9 | debian/app-template/ |
10 | |
11 | === modified file 'CMakeLists.txt' |
12 | --- CMakeLists.txt 2014-07-17 19:16:18 +0000 |
13 | +++ CMakeLists.txt 2014-09-18 21:37:28 +0000 |
14 | @@ -1,5 +1,7 @@ |
15 | project(com.ubuntu.shorts) |
16 | cmake_minimum_required(VERSION 2.8.9) |
17 | +find_program(INTLTOOL_MERGE intltool-merge) |
18 | +find_program(INTLTOOL_EXTRACT intltool-extract) |
19 | |
20 | # Standard install paths |
21 | include(GNUInstallDirs) |
22 | @@ -37,11 +39,11 @@ |
23 | endif(CLICK_MODE) |
24 | |
25 | file(GLOB_RECURSE I18N_SRC_FILES |
26 | - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} |
27 | - rc/**.qml desktop/**.desktop.in) |
28 | + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po |
29 | + *.js *.qml) |
30 | +list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h) |
31 | list(SORT I18N_SRC_FILES) |
32 | |
33 | - |
34 | file(GLOB SRC_FILES |
35 | RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} |
36 | *.qml *.js *.png *.json) |
37 | @@ -54,9 +56,14 @@ |
38 | DESTINATION ${DATA_DIR}) |
39 | install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR}) |
40 | |
41 | -configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}) |
42 | +configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in) |
43 | +add_custom_target(${DESKTOP_FILE} ALL |
44 | + COMMENT "Merging translations into ${DESKTOP_FILE}..." |
45 | + COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} |
46 | +) |
47 | + |
48 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} |
49 | - DESTINATION ${DESKTOP_DIR}) |
50 | + DESTINATION ${DESKTOP_DIR}) |
51 | |
52 | # Tests |
53 | enable_testing() |
54 | |
55 | === modified file 'README.translations' |
56 | --- README.translations 2013-09-26 06:53:21 +0000 |
57 | +++ README.translations 2014-09-18 21:37:28 +0000 |
58 | @@ -10,10 +10,9 @@ |
59 | translatable messages to translators. So whenever you add new translatable |
60 | messages in the code, make sure to follow these steps: |
61 | |
62 | - 1. Change directory to the po/ folder: `cd po` |
63 | - 2. Update the translations template: `qmake && make pot` |
64 | - 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"` |
65 | - 4. Push the branch and send a merge proposal as usual |
66 | + 1. Run click-buddy retaining the build directory: |
67 | + `click-buddy --dir . --no-clean` |
68 | + 2. Commit and push the branch and send a merge proposal as usual |
69 | |
70 | And that's it, once the branch lands Launchpad should take care of all the rest! |
71 | |
72 | |
73 | === renamed file 'com.ubuntu.shorts_shorts.desktop.in' => 'com.ubuntu.shorts_shorts.desktop.in.in' |
74 | --- com.ubuntu.shorts_shorts.desktop.in 2014-07-21 14:51:40 +0000 |
75 | +++ com.ubuntu.shorts_shorts.desktop.in.in 2014-09-18 21:37:28 +0000 |
76 | @@ -4,8 +4,8 @@ |
77 | Terminal=false |
78 | Exec=@EXEC@ |
79 | Icon=@ICON@ |
80 | -Name=Shorts |
81 | -Keywords=shorts;rss;reader |
82 | +_Name=Shorts |
83 | +_Keywords=shorts;rss;reader; |
84 | X-Ubuntu-Touch=true |
85 | X-Ubuntu-Gettext-Domain=@PROJECT_NAME@ |
86 | X-Ubuntu-Default-Department-ID=accessories |
87 | |
88 | === modified file 'debian/control' |
89 | --- debian/control 2014-09-08 20:17:25 +0000 |
90 | +++ debian/control 2014-09-18 21:37:28 +0000 |
91 | @@ -4,6 +4,7 @@ |
92 | Build-Depends: cmake, |
93 | python3, |
94 | debhelper (>= 9), |
95 | + intltool, |
96 | Standards-Version: 3.9.4 |
97 | Section: misc |
98 | Homepage: https://launchpad.net/ubuntu-rssreader-app |
99 | |
100 | === modified file 'po/CMakeLists.txt' |
101 | --- po/CMakeLists.txt 2014-01-31 21:23:34 +0000 |
102 | +++ po/CMakeLists.txt 2014-09-18 21:37:28 +0000 |
103 | @@ -5,15 +5,20 @@ |
104 | set(POT_FILE ${DOMAIN}.pot) |
105 | file(GLOB PO_FILES *.po) |
106 | |
107 | -add_custom_target(${POT_FILE} |
108 | - COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE} |
109 | - -D ${CMAKE_SOURCE_DIR} |
110 | - --from-code=UTF-8 |
111 | - --c++ --qt --add-comments=TRANSLATORS |
112 | - --keyword=tr --keyword=tr:1,2 |
113 | - --package-name='${PROJECT}' |
114 | - --copyright-holder='Canonical Ltd.' |
115 | - ${I18N_SRC_FILES}) |
116 | +add_custom_target(${POT_FILE} ALL |
117 | + COMMENT "Generating translation template..." |
118 | + COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini |
119 | + --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in |
120 | + COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE} |
121 | + -D ${CMAKE_CURRENT_SOURCE_DIR} |
122 | + -D ${CMAKE_CURRENT_BINARY_DIR} |
123 | + --from-code=UTF-8 |
124 | + --c++ --qt --add-comments=TRANSLATORS |
125 | + --keyword=tr --keyword=tr:1,2 --keyword=N_ |
126 | + --package-name='${PROJECT}' |
127 | + --copyright-holder='Canonical Ltd.' |
128 | + ${I18N_SRC_FILES} |
129 | + COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}) |
130 | |
131 | foreach(PO_FILE ${PO_FILES}) |
132 | get_filename_component(LANG ${PO_FILE} NAME_WE) |
133 | |
134 | === renamed file 'po/rssreader-app.pot' => 'po/com.ubuntu.shorts.pot' |
135 | --- po/rssreader-app.pot 2014-08-05 07:06:44 +0000 |
136 | +++ po/com.ubuntu.shorts.pot 2014-09-18 21:37:28 +0000 |
137 | @@ -1,14 +1,14 @@ |
138 | # SOME DESCRIPTIVE TITLE. |
139 | -# Copyright (C) YEAR Canonical Ltd. |
140 | +# Copyright (C) YEAR Canonical Ltd. |
141 | # This file is distributed under the same license as the PACKAGE package. |
142 | # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
143 | # |
144 | #, fuzzy |
145 | msgid "" |
146 | msgstr "" |
147 | -"Project-Id-Version: rssreader-app\n" |
148 | +"Project-Id-Version: \n" |
149 | "Report-Msgid-Bugs-To: \n" |
150 | -"POT-Creation-Date: 2014-08-05 15:01+0800\n" |
151 | +"POT-Creation-Date: 2014-09-18 23:03+0200\n" |
152 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
153 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
154 | "Language-Team: LANGUAGE <LL@li.org>\n" |
155 | @@ -22,28 +22,24 @@ |
156 | msgid "Select article" |
157 | msgstr "" |
158 | |
159 | -#: ../ArticleViewItem.qml:232 |
160 | -msgid "Show media" |
161 | -msgstr "" |
162 | - |
163 | -#: ../ListModePage.qml:267 ../shorts-app.qml:242 |
164 | -msgid "Add reads" |
165 | -msgstr "" |
166 | - |
167 | -#: ../ListModePage.qml:285 ../RssFeedPage.qml:42 |
168 | +#: ../ArticleViewItem.qml:261 |
169 | +msgid "Back" |
170 | +msgstr "" |
171 | + |
172 | +#: ../ArticleViewItem.qml:278 |
173 | msgid "Options" |
174 | msgstr "" |
175 | |
176 | -#: ../ListModePage.qml:301 ../RssFeedPage.qml:52 |
177 | +#: ../ArticleViewItem.qml:296 |
178 | msgid "Save" |
179 | msgstr "" |
180 | |
181 | -#: ../ListModePage.qml:301 ../RssFeedPage.qml:52 ../feeds/SwipeDelete.qml:57 |
182 | +#: ../ArticleViewItem.qml:296 ../feeds/SwipeDelete.qml:57 |
183 | #: ../feeds/SwipeDelete.qml:76 |
184 | msgid "Remove" |
185 | msgstr "" |
186 | |
187 | -#: ../ListModePage.qml:323 ../RssFeedPage.qml:70 |
188 | +#: ../ArticleViewItem.qml:322 |
189 | msgid "Open site" |
190 | msgstr "" |
191 | |
192 | @@ -67,80 +63,6 @@ |
193 | msgid "There are no articles to show" |
194 | msgstr "" |
195 | |
196 | -#: ../shorts-app.qml:196 |
197 | -msgid "Refresh" |
198 | -msgstr "" |
199 | - |
200 | -#: ../shorts-app.qml:208 |
201 | -msgid "Grid View" |
202 | -msgstr "" |
203 | - |
204 | -#: ../shorts-app.qml:208 |
205 | -msgid "List view" |
206 | -msgstr "" |
207 | - |
208 | -#: ../shorts-app.qml:251 ../feeds/TopicManagement.qml:13 |
209 | -msgid "Edit topics" |
210 | -msgstr "" |
211 | - |
212 | -#: ../shorts-app.qml:360 |
213 | -msgid "Saved" |
214 | -msgstr "" |
215 | - |
216 | -#: ../shorts-app.qml:368 ../.build/com.ubuntu.shorts_shorts.desktop.in:1 |
217 | -msgid "Shorts" |
218 | -msgstr "" |
219 | - |
220 | -#: ../shorts-app.qml:433 ../feeds/AppendFeedPage.qml:30 |
221 | -msgid "Add feeds" |
222 | -msgstr "" |
223 | - |
224 | -#: ../shorts-app.qml:484 |
225 | -msgid "Checking for new articles" |
226 | -msgstr "" |
227 | - |
228 | -#: ../shorts-app.qml:492 ../feeds/AppendFeedPage.qml:53 |
229 | -#: ../feeds/CreateTopicPage.qml:31 ../feeds/EditFeed.qml:24 |
230 | -#: ../feeds/TopicManagement.qml:77 |
231 | -msgid "Cancel" |
232 | -msgstr "" |
233 | - |
234 | -#: ../shorts-app.qml:508 |
235 | -msgid "Perhaps some of the channels have not been updated." |
236 | -msgstr "" |
237 | - |
238 | -#: ../shorts-app.qml:509 |
239 | -msgid "Errors occurred during the update" |
240 | -msgstr "" |
241 | - |
242 | -#: ../shorts-app.qml:527 |
243 | -msgid "+ Add feeds" |
244 | -msgstr "" |
245 | - |
246 | -#: ../shorts-app.qml:547 |
247 | -msgid "Add online accounts" |
248 | -msgstr "" |
249 | - |
250 | -#: ../shorts-app.qml:550 |
251 | -msgid "Online accounts are not available for now" |
252 | -msgstr "" |
253 | - |
254 | -#: ../shorts-app.qml:551 ../shorts-app.qml:560 |
255 | -msgid "We are sorry" |
256 | -msgstr "" |
257 | - |
258 | -#: ../shorts-app.qml:556 |
259 | -msgid "Import subscriptions" |
260 | -msgstr "" |
261 | - |
262 | -#: ../shorts-app.qml:559 |
263 | -msgid "Importing subscriptions is not available for now" |
264 | -msgstr "" |
265 | - |
266 | -#: ../shorts-app.qml:574 |
267 | -msgid "Ok" |
268 | -msgstr "" |
269 | - |
270 | #. TRANSLATORS: this is a time formatting string, |
271 | #. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions |
272 | #: ../dateutils.js:39 |
273 | @@ -189,31 +111,41 @@ |
274 | msgstr[0] "" |
275 | msgstr[1] "" |
276 | |
277 | -#: ../feeds/AppendFeedPage.qml:79 |
278 | -msgid "Next" |
279 | +#: ../feeds/AppendFeedPage.qml:30 ../shorts-app.qml:249 ../shorts-app.qml:440 |
280 | +msgid "Add feeds" |
281 | msgstr "" |
282 | |
283 | -#: ../feeds/AppendFeedPage.qml:131 |
284 | +#: ../feeds/AppendFeedPage.qml:68 |
285 | msgid "Failed to perform a feed search by keyword" |
286 | msgstr "" |
287 | |
288 | -#: ../feeds/AppendFeedPage.qml:132 ../feeds/AppendFeedPage.qml:159 |
289 | +#: ../feeds/AppendFeedPage.qml:69 ../feeds/AppendFeedPage.qml:96 |
290 | msgid "Search failed" |
291 | msgstr "" |
292 | |
293 | -#: ../feeds/AppendFeedPage.qml:158 |
294 | +#: ../feeds/AppendFeedPage.qml:95 |
295 | msgid "Failed to perform a feed search by URL" |
296 | msgstr "" |
297 | |
298 | -#: ../feeds/AppendFeedPage.qml:195 |
299 | +#: ../feeds/AppendFeedPage.qml:132 |
300 | msgid "Type a keyword or URL" |
301 | msgstr "" |
302 | |
303 | -#: ../feeds/AppendFeedPage.qml:246 |
304 | +#: ../feeds/AppendFeedPage.qml:184 |
305 | msgid "Search results" |
306 | msgstr "" |
307 | |
308 | -#: ../feeds/AppendFeedPage.qml:290 ../feeds/CreateTopicPage.qml:171 |
309 | +#: ../feeds/AppendFeedPage.qml:242 ../feeds/CreateTopicPage.qml:38 |
310 | +#: ../feeds/EditFeed.qml:24 ../feeds/TopicManagement.qml:64 |
311 | +#: ../shorts-app.qml:499 |
312 | +msgid "Cancel" |
313 | +msgstr "" |
314 | + |
315 | +#: ../feeds/AppendFeedPage.qml:275 |
316 | +msgid "Next" |
317 | +msgstr "" |
318 | + |
319 | +#: ../feeds/AppendFeedPage.qml:304 ../feeds/CreateTopicPage.qml:183 |
320 | msgid "No feeds" |
321 | msgstr "" |
322 | |
323 | @@ -221,28 +153,24 @@ |
324 | msgid "Choose topic" |
325 | msgstr "" |
326 | |
327 | -#: ../feeds/ChooseTopicPage.qml:34 |
328 | -msgid "Previous" |
329 | -msgstr "" |
330 | - |
331 | -#: ../feeds/ChooseTopicPage.qml:104 |
332 | +#: ../feeds/ChooseTopicPage.qml:79 |
333 | msgid "Add your new feeds to a topic" |
334 | msgstr "" |
335 | |
336 | -#: ../feeds/ChooseTopicPage.qml:115 |
337 | +#: ../feeds/ChooseTopicPage.qml:90 |
338 | msgid " + New topic" |
339 | msgstr "" |
340 | |
341 | -#: ../feeds/ChooseTopicPage.qml:159 ../feeds/CreateTopicPage.qml:67 |
342 | +#: ../feeds/ChooseTopicPage.qml:134 ../feeds/CreateTopicPage.qml:78 |
343 | msgid "A topic with this name already exists" |
344 | msgstr "" |
345 | |
346 | -#: ../feeds/ChooseTopicPage.qml:160 ../feeds/ChooseTopicPage.qml:173 |
347 | -#: ../feeds/CreateTopicPage.qml:56 ../feeds/CreateTopicPage.qml:68 |
348 | +#: ../feeds/ChooseTopicPage.qml:135 ../feeds/ChooseTopicPage.qml:148 |
349 | +#: ../feeds/CreateTopicPage.qml:67 ../feeds/CreateTopicPage.qml:79 |
350 | msgid "Warning" |
351 | msgstr "" |
352 | |
353 | -#: ../feeds/ChooseTopicPage.qml:172 ../feeds/CreateTopicPage.qml:55 |
354 | +#: ../feeds/ChooseTopicPage.qml:147 ../feeds/CreateTopicPage.qml:66 |
355 | msgid "Topic name can't contain only whitespaces" |
356 | msgstr "" |
357 | |
358 | @@ -250,15 +178,15 @@ |
359 | msgid "Create new topic" |
360 | msgstr "" |
361 | |
362 | -#: ../feeds/CreateTopicPage.qml:45 ../feeds/TopicManagement.qml:151 |
363 | +#: ../feeds/CreateTopicPage.qml:56 ../feeds/TopicManagement.qml:164 |
364 | msgid "Add topic" |
365 | msgstr "" |
366 | |
367 | -#: ../feeds/CreateTopicPage.qml:116 |
368 | +#: ../feeds/CreateTopicPage.qml:128 |
369 | msgid "Type topic name" |
370 | msgstr "" |
371 | |
372 | -#: ../feeds/CreateTopicPage.qml:132 |
373 | +#: ../feeds/CreateTopicPage.qml:144 |
374 | msgid "Select feeds (optional)" |
375 | msgstr "" |
376 | |
377 | @@ -286,10 +214,78 @@ |
378 | msgid "Topic: " |
379 | msgstr "" |
380 | |
381 | -#: ../feeds/TopicManagement.qml:56 |
382 | +#: ../feeds/TopicManagement.qml:13 ../shorts-app.qml:262 |
383 | +msgid "Edit topics" |
384 | +msgstr "" |
385 | + |
386 | +#: ../feeds/TopicManagement.qml:84 |
387 | +msgid "Confirm" |
388 | +msgstr "" |
389 | + |
390 | +#: ../feeds/TopicManagement.qml:101 |
391 | msgid "Add Feed" |
392 | msgstr "" |
393 | |
394 | -#: ../feeds/TopicManagement.qml:92 |
395 | -msgid "Confirm" |
396 | +#: ../shorts-app.qml:198 |
397 | +msgid "Refresh" |
398 | +msgstr "" |
399 | + |
400 | +#: ../shorts-app.qml:210 |
401 | +msgid "Grid View" |
402 | +msgstr "" |
403 | + |
404 | +#: ../shorts-app.qml:210 |
405 | +msgid "List view" |
406 | +msgstr "" |
407 | + |
408 | +#: ../shorts-app.qml:367 |
409 | +msgid "Saved" |
410 | +msgstr "" |
411 | + |
412 | +#: ../shorts-app.qml:375 com.ubuntu.shorts_shorts.desktop.in.in.h:1 |
413 | +msgid "Shorts" |
414 | +msgstr "" |
415 | + |
416 | +#: ../shorts-app.qml:491 |
417 | +msgid "Checking for new articles" |
418 | +msgstr "" |
419 | + |
420 | +#: ../shorts-app.qml:515 |
421 | +msgid "Perhaps some of the channels have not been updated." |
422 | +msgstr "" |
423 | + |
424 | +#: ../shorts-app.qml:516 |
425 | +msgid "Errors occurred during the update" |
426 | +msgstr "" |
427 | + |
428 | +#: ../shorts-app.qml:534 |
429 | +msgid "+ Add feeds" |
430 | +msgstr "" |
431 | + |
432 | +#: ../shorts-app.qml:554 |
433 | +msgid "Add online accounts" |
434 | +msgstr "" |
435 | + |
436 | +#: ../shorts-app.qml:557 |
437 | +msgid "Online accounts are not available for now" |
438 | +msgstr "" |
439 | + |
440 | +#: ../shorts-app.qml:558 ../shorts-app.qml:567 |
441 | +msgid "We are sorry" |
442 | +msgstr "" |
443 | + |
444 | +#: ../shorts-app.qml:563 |
445 | +msgid "Import subscriptions" |
446 | +msgstr "" |
447 | + |
448 | +#: ../shorts-app.qml:566 |
449 | +msgid "Importing subscriptions is not available for now" |
450 | +msgstr "" |
451 | + |
452 | +#: ../shorts-app.qml:581 |
453 | +msgid "Ok" |
454 | +msgstr "" |
455 | + |
456 | +#: com.ubuntu.shorts_shorts.desktop.in.in.h:2 |
457 | +msgid "shorts;rss;reader;" |
458 | msgstr "" |
459 | |
460 | === removed file 'po/po.pro' |
461 | --- po/po.pro 2014-08-05 07:06:44 +0000 |
462 | +++ po/po.pro 1970-01-01 00:00:00 +0000 |
463 | @@ -1,58 +0,0 @@ |
464 | -## This .pro file is used to create a Makefile with the necessary rules |
465 | -## to create an initial translations template and to update it whenever |
466 | -## there are new translatable strings in the project that are ready to be |
467 | -## exposed to translators |
468 | -## |
469 | -## See the ../README.translations file for more information |
470 | - |
471 | -TEMPLATE = subdirs |
472 | - |
473 | -PROJECTNAME = $$system(basename ../*.qmlproject) |
474 | -PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,) |
475 | - |
476 | -DESKTOPFILE = ../com.ubuntu.shorts_shorts.desktop.in |
477 | - |
478 | -SOURCECODE = ../*.qml \ |
479 | - ../*.js \ |
480 | - ../article_items/*.qml \ |
481 | - ../feeds/*.qml |
482 | - |
483 | -BUILDDIR = ../.build |
484 | -DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.shorts_shorts.desktop.in |
485 | - |
486 | -message("") |
487 | -message(" Project Name: $$PROJECTNAME ") |
488 | -message(" Source Code: $$SOURCECODE ") |
489 | -message("") |
490 | -message(" Run 'make pot' to generate the pot file from source code. ") |
491 | -message("") |
492 | - |
493 | -## Generate pot file 'make pot' |
494 | -potfile.target = pot |
495 | -potfile.commands = xgettext \ |
496 | - -o $${PROJECTNAME}.pot \ |
497 | - --copyright=\"Canonical Ltd. \" \ |
498 | - --package-name $${PROJECTNAME} \ |
499 | - --qt --c++ --add-comments=TRANSLATORS \ |
500 | - --keyword=tr --keyword=tr:1,2 \ |
501 | - $${SOURCECODE} $${DESKTOPFILETEMP} |
502 | -potfile.depends = desktopfile |
503 | -QMAKE_EXTRA_TARGETS += potfile |
504 | - |
505 | -## Do not use this rule directly. It's a dependency rule to |
506 | -## generate an intermediate .js file to extract translatable |
507 | -## strings from the .desktop file |
508 | -desktopfile.target = desktopfile |
509 | -desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP} |
510 | -desktopfile.depends = makebuilddir |
511 | -QMAKE_EXTRA_TARGETS += desktopfile |
512 | - |
513 | -## Dependency rule to create the temporary build dir |
514 | -makebuilddir.target = makebuilddir |
515 | -makebuilddir.commands = mkdir -p $${BUILDDIR} |
516 | -QMAKE_EXTRA_TARGETS += makebuilddir |
517 | - |
518 | -## Rule to clean the products of the build |
519 | -clean.target = clean |
520 | -clean.commands = rm -Rf $${BUILDDIR} |
521 | -QMAKE_EXTRA_TARGETS += clean |
522 | |
523 | === removed file 'po/po.pro.user' |
524 | --- po/po.pro.user 2013-08-01 20:01:41 +0000 |
525 | +++ po/po.pro.user 1970-01-01 00:00:00 +0000 |
526 | @@ -1,63 +0,0 @@ |
527 | -<?xml version="1.0" encoding="UTF-8"?> |
528 | -<!DOCTYPE QtCreatorProject> |
529 | -<!-- Written by QtCreator 2.7.1, 2013-07-29T21:43:07. --> |
530 | -<qtcreator> |
531 | - <data> |
532 | - <variable>ProjectExplorer.Project.ActiveTarget</variable> |
533 | - <value type="int">-1</value> |
534 | - </data> |
535 | - <data> |
536 | - <variable>ProjectExplorer.Project.EditorSettings</variable> |
537 | - <valuemap type="QVariantMap"> |
538 | - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> |
539 | - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> |
540 | - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> |
541 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> |
542 | - <value type="QByteArray" key="language">Cpp</value> |
543 | - <valuemap type="QVariantMap" key="value"> |
544 | - <value type="QString" key="CurrentPreferences">CppGlobal</value> |
545 | - </valuemap> |
546 | - </valuemap> |
547 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> |
548 | - <value type="QByteArray" key="language">QmlJS</value> |
549 | - <valuemap type="QVariantMap" key="value"> |
550 | - <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> |
551 | - </valuemap> |
552 | - </valuemap> |
553 | - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> |
554 | - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> |
555 | - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> |
556 | - <value type="int" key="EditorConfiguration.IndentSize">4</value> |
557 | - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> |
558 | - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> |
559 | - <value type="int" key="EditorConfiguration.PaddingMode">1</value> |
560 | - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> |
561 | - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> |
562 | - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> |
563 | - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> |
564 | - <value type="int" key="EditorConfiguration.TabSize">8</value> |
565 | - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> |
566 | - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> |
567 | - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> |
568 | - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> |
569 | - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> |
570 | - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> |
571 | - </valuemap> |
572 | - </data> |
573 | - <data> |
574 | - <variable>ProjectExplorer.Project.PluginSettings</variable> |
575 | - <valuemap type="QVariantMap"/> |
576 | - </data> |
577 | - <data> |
578 | - <variable>ProjectExplorer.Project.TargetCount</variable> |
579 | - <value type="int">0</value> |
580 | - </data> |
581 | - <data> |
582 | - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
583 | - <value type="QString">{e33c9772-4509-4210-9d1d-661ba661ef84}</value> |
584 | - </data> |
585 | - <data> |
586 | - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
587 | - <value type="int">12</value> |
588 | - </data> |
589 | -</qtcreator> |
FAILED: Continuous integration, rev:314 91.189. 93.70:8080/ job/ubuntu- rssreader- app-ci/ 265/ 91.189. 93.70:8080/ job/generic- mediumtests- utopic- python3/ 376/console 91.189. 93.70:8080/ job/ubuntu- rssreader- app-utopic- amd64-ci/ 44/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- rssreader- app-ci/ 265/rebuild
http://