Merge lp:~ted/mediaplayer-app/trusted-session-helper into lp:mediaplayer-app/rtm-14.09

Proposed by Ted Gould
Status: Rejected
Rejected by: Ted Gould
Proposed branch: lp:~ted/mediaplayer-app/trusted-session-helper
Merge into: lp:mediaplayer-app/rtm-14.09
Diff against target: 677 lines (+79/-118)
19 files modified
CMakeLists.txt (+0/-1)
data/CMakeLists.txt (+0/-11)
data/mediaplayer-app.desktop.in.in (+0/-13)
debian/mediaplayer-app.install (+0/-1)
po/CMakeLists.txt (+0/-6)
po/br.po (+5/-5)
po/ca.po (+5/-4)
po/ca@valencia.po (+5/-5)
po/de.po (+5/-5)
po/en_GB.po (+4/-4)
po/fr.po (+5/-5)
po/it.po (+5/-5)
po/mediaplayer-app.pot (+1/-9)
po/nb.po (+5/-5)
po/pl.po (+11/-11)
po/ro.po (+5/-5)
po/sl.po (+5/-5)
po/ug.po (+5/-5)
po/zh_TW.po (+13/-13)
To merge this branch: bzr merge lp:~ted/mediaplayer-app/trusted-session-helper
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+245911@code.launchpad.net

Commit message

Change from an app to a helper

To post a comment you must log in.

Unmerged revisions

328. By Ted Gould

Change pot file so there's nothing in the diff

327. By Ted Gould

Drop helper dependencies

326. By Ted Gould

Drop the helper from mediaplayer-app

325. By Ted Gould

Adding glib and mir build dependencies

324. By Ted Gould

Merging RTM 14.09 branch

323. By Ted Gould

Fix name of who is connecting

322. By Ted Gould

Add helper to packages

321. By Ted Gould

Flesh out the helper

320. By Ted Gould

Skeleton for the helper

319. By Ted Gould

Adding in a helper directory

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-10-02 13:42:17 +0000
3+++ CMakeLists.txt 2015-01-16 15:44:43 +0000
4@@ -4,7 +4,6 @@
5
6 # Find includes in corresponding build directories
7 set(CMAKE_INCLUDE_CURRENT_DIR ON)
8-set(DESKTOP_FILE mediaplayer-app.desktop)
9
10 # Instruct CMake to run moc automatically when needed.
11 set(CMAKE_AUTOMOC ON)
12
13=== modified file 'data/CMakeLists.txt'
14--- data/CMakeLists.txt 2014-10-02 13:42:17 +0000
15+++ data/CMakeLists.txt 2015-01-16 15:44:43 +0000
16@@ -1,18 +1,7 @@
17-set(MEDIAPLAYER_DESKTOP_FILE mediaplayer-app.desktop)
18 set(MEDIAPLAYER_APP_ICON mediaplayer-app.png)
19 set(MEDIAPLAYER_APP_SYMBOLIC_ICON mediaplayer-app-symbolic.svg)
20 set(MEDIAPLAYER_URL_DISPATCHER mediaplayer-app.url-dispatcher)
21
22-configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
23-add_custom_target(${DESKTOP_FILE} ALL
24- COMMENT "Merging translations into ${DESKTOP_FILE}"
25- COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
26- )
27-
28-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MEDIAPLAYER_DESKTOP_FILE}
29- DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
30-)
31-
32 install(FILES ${MEDIAPLAYER_APP_ICON} ${MEDIAPLAYER_APP_SYMBOLIC_ICON}
33 DESTINATION ${MEDIAPLAYER_DIR}
34 )
35
36=== removed file 'data/mediaplayer-app.desktop.in.in'
37--- data/mediaplayer-app.desktop.in.in 2014-10-02 19:11:44 +0000
38+++ data/mediaplayer-app.desktop.in.in 1970-01-01 00:00:00 +0000
39@@ -1,13 +0,0 @@
40-[Desktop Entry]
41-Type=Application
42-_Name=Media Player
43-_GenericName=Media Player
44-_Comment=Media Player
45-_Keywords=Movies;Movie Player;Video Player
46-Exec=mediaplayer-app %u
47-Terminal=false
48-Icon=@MEDIAPLAYER_DIR@/@MEDIAPLAYER_APP_ICON@
49-X-Ubuntu-SymbolicIcon=@MEDIAPLAYER_DIR@/@MEDIAPLAYER_APP_SYMBOLIC_ICON@
50-X-Ubuntu-Gettext-Domain=mediaplayer-app
51-X-Ubuntu-Single-Instance=true
52-X-Ubuntu-Default-Department-ID=sound-video
53
54=== modified file 'debian/mediaplayer-app.install'
55--- debian/mediaplayer-app.install 2014-09-29 20:53:44 +0000
56+++ debian/mediaplayer-app.install 2015-01-16 15:44:43 +0000
57@@ -1,4 +1,3 @@
58-/usr/share/applications/mediaplayer-app.desktop
59 /usr/bin/mediaplayer-app
60 /usr/share/mediaplayer-app/mediaplayer-app.png
61 /usr/share/mediaplayer-app/mediaplayer-app-symbolic.svg
62
63=== modified file 'po/CMakeLists.txt'
64--- po/CMakeLists.txt 2014-11-10 17:49:21 +0000
65+++ po/CMakeLists.txt 2015-01-16 15:44:43 +0000
66@@ -9,9 +9,6 @@
67 ${CMAKE_SOURCE_DIR}/src/*.qml)
68 list(SORT I18N_SRCS)
69
70-file(RELATIVE_PATH DESKTOP_FILE_IN_IN ${CMAKE_CURRENT_SOURCE_DIR}
71- ${CMAKE_SOURCE_DIR}/data/${DESKTOP_FILE}.in.in)
72-
73 foreach(PO_FILE ${PO_FILES})
74 get_filename_component(LANG ${PO_FILE} NAME_WE)
75 gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
76@@ -25,8 +22,6 @@
77 if(XGETTEXT_EXECUTABLE)
78 add_custom_target(${POT_FILE} ALL
79 COMMENT "Generating translation template"
80- COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
81- --srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${DESKTOP_FILE_IN_IN}
82 COMMAND ${XGETTEXT_EXECUTABLE} -o ${POT_FILE}
83 --c++ --qt --add-comments=TRANSLATORS
84 --keyword=tr --keyword=tr:1,2 --keyword=N_
85@@ -34,7 +29,6 @@
86 --copyright-holder='Canonical Ltd.'
87 -s -p ${CMAKE_CURRENT_SOURCE_DIR}
88 -D ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRCS}
89- -D ${CMAKE_CURRENT_BINARY_DIR} ${DESKTOP_FILE_IN_IN}.h
90 )
91
92 add_custom_target(translations
93
94=== modified file 'po/br.po'
95--- po/br.po 2014-11-06 06:35:46 +0000
96+++ po/br.po 2015-01-16 15:44:43 +0000
97@@ -8,14 +8,14 @@
98 "Project-Id-Version: mediaplayer-app\n"
99 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
100 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
101-"PO-Revision-Date: 2014-10-07 07:00+0000\n"
102+"PO-Revision-Date: 2014-11-18 07:28+0000\n"
103 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
104 "Language-Team: Breton <br@li.org>\n"
105 "MIME-Version: 1.0\n"
106 "Content-Type: text/plain; charset=UTF-8\n"
107 "Content-Transfer-Encoding: 8bit\n"
108-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
109-"X-Generator: Launchpad (build 17223)\n"
110+"X-Launchpad-Export-Date: 2014-11-19 06:22+0000\n"
111+"X-Generator: Launchpad (build 17252)\n"
112
113 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
114 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
115@@ -54,11 +54,11 @@
116
117 #: ../data/mediaplayer-app.desktop.in.in.h:1
118 msgid "Media Player"
119-msgstr ""
120+msgstr "Lenner liesvedia"
121
122 #: ../data/mediaplayer-app.desktop.in.in.h:2
123 msgid "Movies;Movie Player;Video Player"
124-msgstr ""
125+msgstr "Filmoù;Lenner filmoù;Lenner video"
126
127 #: ../src/qml/player.qml:68
128 msgid ""
129
130=== modified file 'po/ca.po'
131--- po/ca.po 2014-11-06 06:35:46 +0000
132+++ po/ca.po 2015-01-16 15:44:43 +0000
133@@ -8,14 +8,14 @@
134 "Project-Id-Version: mediaplayer-app\n"
135 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
136 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
137-"PO-Revision-Date: 2014-10-06 12:12+0000\n"
138+"PO-Revision-Date: 2014-11-10 09:21+0000\n"
139 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
140 "Language-Team: Catalan <ca@li.org>\n"
141 "MIME-Version: 1.0\n"
142 "Content-Type: text/plain; charset=UTF-8\n"
143 "Content-Transfer-Encoding: 8bit\n"
144-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
145-"X-Generator: Launchpad (build 17223)\n"
146+"X-Launchpad-Export-Date: 2014-11-11 07:08+0000\n"
147+"X-Generator: Launchpad (build 17241)\n"
148
149 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
150 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
151@@ -54,11 +54,12 @@
152
153 #: ../data/mediaplayer-app.desktop.in.in.h:1
154 msgid "Media Player"
155-msgstr ""
156+msgstr "Reproductor multimèdia"
157
158 #: ../data/mediaplayer-app.desktop.in.in.h:2
159 msgid "Movies;Movie Player;Video Player"
160 msgstr ""
161+"pel·lícules;peŀlícules,vídeo;reproductor;reproductor de vídeo;youtube;"
162
163 #: ../src/qml/player.qml:68
164 msgid ""
165
166=== modified file 'po/ca@valencia.po'
167--- po/ca@valencia.po 2014-11-06 06:35:46 +0000
168+++ po/ca@valencia.po 2015-01-16 15:44:43 +0000
169@@ -8,14 +8,14 @@
170 "Project-Id-Version: mediaplayer-app\n"
171 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
172 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
173-"PO-Revision-Date: 2014-10-15 14:37+0000\n"
174+"PO-Revision-Date: 2014-11-23 07:19+0000\n"
175 "Last-Translator: Pau Iranzo <Unknown>\n"
176 "Language-Team: Catalan <ca@li.org>\n"
177 "MIME-Version: 1.0\n"
178 "Content-Type: text/plain; charset=UTF-8\n"
179 "Content-Transfer-Encoding: 8bit\n"
180-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
181-"X-Generator: Launchpad (build 17223)\n"
182+"X-Launchpad-Export-Date: 2014-11-24 06:18+0000\n"
183+"X-Generator: Launchpad (build 17252)\n"
184
185 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
186 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
187@@ -54,11 +54,11 @@
188
189 #: ../data/mediaplayer-app.desktop.in.in.h:1
190 msgid "Media Player"
191-msgstr ""
192+msgstr "Reproductor multimèdia"
193
194 #: ../data/mediaplayer-app.desktop.in.in.h:2
195 msgid "Movies;Movie Player;Video Player"
196-msgstr ""
197+msgstr "Pel·lícules;Reproductor de pel·lícules;Reproductor de vídeo"
198
199 #: ../src/qml/player.qml:68
200 msgid ""
201
202=== modified file 'po/de.po'
203--- po/de.po 2014-11-06 06:35:46 +0000
204+++ po/de.po 2015-01-16 15:44:43 +0000
205@@ -8,14 +8,14 @@
206 "Project-Id-Version: mediaplayer-app\n"
207 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
208 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
209-"PO-Revision-Date: 2014-10-21 11:25+0000\n"
210+"PO-Revision-Date: 2014-11-12 14:08+0000\n"
211 "Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"
212 "Language-Team: German <de@li.org>\n"
213 "MIME-Version: 1.0\n"
214 "Content-Type: text/plain; charset=UTF-8\n"
215 "Content-Transfer-Encoding: 8bit\n"
216-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
217-"X-Generator: Launchpad (build 17223)\n"
218+"X-Launchpad-Export-Date: 2014-11-13 06:33+0000\n"
219+"X-Generator: Launchpad (build 17241)\n"
220
221 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
222 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
223@@ -54,11 +54,11 @@
224
225 #: ../data/mediaplayer-app.desktop.in.in.h:1
226 msgid "Media Player"
227-msgstr ""
228+msgstr "Medienwiedergabe"
229
230 #: ../data/mediaplayer-app.desktop.in.in.h:2
231 msgid "Movies;Movie Player;Video Player"
232-msgstr ""
233+msgstr "Filme;Filmwiedergabe;Videowiedergabe"
234
235 #: ../src/qml/player.qml:68
236 msgid ""
237
238=== modified file 'po/en_GB.po'
239--- po/en_GB.po 2014-11-06 06:35:46 +0000
240+++ po/en_GB.po 2015-01-16 15:44:43 +0000
241@@ -8,14 +8,14 @@
242 "Project-Id-Version: mediaplayer-app\n"
243 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
244 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
245-"PO-Revision-Date: 2014-10-03 12:46+0000\n"
246+"PO-Revision-Date: 2014-12-04 11:20+0000\n"
247 "Last-Translator: Andi Chandler <Unknown>\n"
248 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
249 "MIME-Version: 1.0\n"
250 "Content-Type: text/plain; charset=UTF-8\n"
251 "Content-Transfer-Encoding: 8bit\n"
252-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
253-"X-Generator: Launchpad (build 17223)\n"
254+"X-Launchpad-Export-Date: 2014-12-05 06:22+0000\n"
255+"X-Generator: Launchpad (build 17274)\n"
256
257 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
258 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
259@@ -54,7 +54,7 @@
260
261 #: ../data/mediaplayer-app.desktop.in.in.h:1
262 msgid "Media Player"
263-msgstr ""
264+msgstr "Media Player"
265
266 #: ../data/mediaplayer-app.desktop.in.in.h:2
267 msgid "Movies;Movie Player;Video Player"
268
269=== modified file 'po/fr.po'
270--- po/fr.po 2014-11-10 06:07:20 +0000
271+++ po/fr.po 2015-01-16 15:44:43 +0000
272@@ -8,14 +8,14 @@
273 "Project-Id-Version: mediaplayer-app\n"
274 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
275 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
276-"PO-Revision-Date: 2014-11-09 21:39+0000\n"
277-"Last-Translator: Jean Marc <Unknown>\n"
278+"PO-Revision-Date: 2014-11-10 08:14+0000\n"
279+"Last-Translator: Anne <anneonyme017@gmail.com>\n"
280 "Language-Team: French <fr@li.org>\n"
281 "MIME-Version: 1.0\n"
282 "Content-Type: text/plain; charset=UTF-8\n"
283 "Content-Transfer-Encoding: 8bit\n"
284-"X-Launchpad-Export-Date: 2014-11-10 06:07+0000\n"
285-"X-Generator: Launchpad (build 17231)\n"
286+"X-Launchpad-Export-Date: 2014-11-11 07:08+0000\n"
287+"X-Generator: Launchpad (build 17241)\n"
288
289 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
290 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
291@@ -58,7 +58,7 @@
292
293 #: ../data/mediaplayer-app.desktop.in.in.h:2
294 msgid "Movies;Movie Player;Video Player"
295-msgstr ""
296+msgstr "Films;Lecteur de films;Lecteur vidéo"
297
298 #: ../src/qml/player.qml:68
299 msgid ""
300
301=== modified file 'po/it.po'
302--- po/it.po 2014-11-06 06:35:46 +0000
303+++ po/it.po 2015-01-16 15:44:43 +0000
304@@ -8,14 +8,14 @@
305 "Project-Id-Version: mediaplayer-app\n"
306 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
307 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
308-"PO-Revision-Date: 2013-10-08 08:49+0000\n"
309+"PO-Revision-Date: 2014-12-26 08:28+0000\n"
310 "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
311 "Language-Team: Italian <it@li.org>\n"
312 "MIME-Version: 1.0\n"
313 "Content-Type: text/plain; charset=UTF-8\n"
314 "Content-Transfer-Encoding: 8bit\n"
315-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
316-"X-Generator: Launchpad (build 17223)\n"
317+"X-Launchpad-Export-Date: 2014-12-27 06:06+0000\n"
318+"X-Generator: Launchpad (build 17286)\n"
319
320 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
321 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
322@@ -54,11 +54,11 @@
323
324 #: ../data/mediaplayer-app.desktop.in.in.h:1
325 msgid "Media Player"
326-msgstr ""
327+msgstr "Riproduttore multimediale"
328
329 #: ../data/mediaplayer-app.desktop.in.in.h:2
330 msgid "Movies;Movie Player;Video Player"
331-msgstr ""
332+msgstr "Film;Video;Riproduttore multimediale"
333
334 #: ../src/qml/player.qml:68
335 msgid ""
336
337=== modified file 'po/mediaplayer-app.pot'
338--- po/mediaplayer-app.pot 2014-11-05 22:59:33 +0000
339+++ po/mediaplayer-app.pot 2015-01-16 15:44:43 +0000
340@@ -8,7 +8,7 @@
341 msgstr ""
342 "Project-Id-Version: mediaplayer-app\n"
343 "Report-Msgid-Bugs-To: \n"
344-"POT-Creation-Date: 2014-11-05 14:28-0300\n"
345+"POT-Creation-Date: 2015-01-16 09:43-0600\n"
346 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
347 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
348 "Language-Team: LANGUAGE <LL@li.org>\n"
349@@ -52,14 +52,6 @@
350 msgid "Fail to open the source video."
351 msgstr ""
352
353-#: ../data/mediaplayer-app.desktop.in.in.h:1
354-msgid "Media Player"
355-msgstr ""
356-
357-#: ../data/mediaplayer-app.desktop.in.in.h:2
358-msgid "Movies;Movie Player;Video Player"
359-msgstr ""
360-
361 #: ../src/qml/player.qml:68
362 msgid ""
363 "No video selected to play. Connect your phone to your computer to transfer "
364
365=== modified file 'po/nb.po'
366--- po/nb.po 2014-11-06 06:35:46 +0000
367+++ po/nb.po 2015-01-16 15:44:43 +0000
368@@ -8,14 +8,14 @@
369 "Project-Id-Version: mediaplayer-app\n"
370 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
371 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
372-"PO-Revision-Date: 2014-10-03 08:42+0000\n"
373+"PO-Revision-Date: 2014-11-12 19:57+0000\n"
374 "Last-Translator: Åka Sikrom <Unknown>\n"
375 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
376 "MIME-Version: 1.0\n"
377 "Content-Type: text/plain; charset=UTF-8\n"
378 "Content-Transfer-Encoding: 8bit\n"
379-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
380-"X-Generator: Launchpad (build 17223)\n"
381+"X-Launchpad-Export-Date: 2014-11-13 06:33+0000\n"
382+"X-Generator: Launchpad (build 17241)\n"
383
384 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
385 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
386@@ -54,11 +54,11 @@
387
388 #: ../data/mediaplayer-app.desktop.in.in.h:1
389 msgid "Media Player"
390-msgstr ""
391+msgstr "Medieasvpiller"
392
393 #: ../data/mediaplayer-app.desktop.in.in.h:2
394 msgid "Movies;Movie Player;Video Player"
395-msgstr ""
396+msgstr "Filmer;Filmavspiller;Videospiller"
397
398 #: ../src/qml/player.qml:68
399 msgid ""
400
401=== modified file 'po/pl.po'
402--- po/pl.po 2014-11-06 06:35:46 +0000
403+++ po/pl.po 2015-01-16 15:44:43 +0000
404@@ -8,14 +8,14 @@
405 "Project-Id-Version: mediaplayer-app\n"
406 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
407 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
408-"PO-Revision-Date: 2014-05-23 14:14+0000\n"
409+"PO-Revision-Date: 2014-12-01 19:10+0000\n"
410 "Last-Translator: GTriderXC <gtriderxc@yahoo.com>\n"
411 "Language-Team: Polish <pl@li.org>\n"
412 "MIME-Version: 1.0\n"
413 "Content-Type: text/plain; charset=UTF-8\n"
414 "Content-Transfer-Encoding: 8bit\n"
415-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
416-"X-Generator: Launchpad (build 17223)\n"
417+"X-Launchpad-Export-Date: 2014-12-02 06:10+0000\n"
418+"X-Generator: Launchpad (build 17274)\n"
419
420 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
421 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
422@@ -30,11 +30,11 @@
423
424 #: ../src/qml/player/VideoPlayer.qml:238
425 msgid "A network error occurred."
426-msgstr ""
427+msgstr "Wystąpił błąd sieci"
428
429 #: ../src/qml/player/VideoPlayer.qml:216
430 msgid "Close"
431-msgstr ""
432+msgstr "Zamknij"
433
434 #: ../src/qml/player.qml:67
435 msgid "Error"
436@@ -42,7 +42,7 @@
437
438 #: ../src/qml/player/VideoPlayer.qml:212
439 msgid "Error playing video"
440-msgstr ""
441+msgstr "Błąd odtwarzania wideo"
442
443 #: ../src/qml/player/VideoPlayer.qml:244
444 msgid "Fail to connect with playback backend."
445@@ -50,11 +50,11 @@
446
447 #: ../src/qml/player/VideoPlayer.qml:232
448 msgid "Fail to open the source video."
449-msgstr ""
450+msgstr "Otwarcie źródła wideo nie powiodło się"
451
452 #: ../data/mediaplayer-app.desktop.in.in.h:1
453 msgid "Media Player"
454-msgstr ""
455+msgstr "Odtwarzacz multimediów"
456
457 #: ../data/mediaplayer-app.desktop.in.in.h:2
458 msgid "Movies;Movie Player;Video Player"
459@@ -68,7 +68,7 @@
460
461 #: ../src/qml/player.qml:71
462 msgid "Ok"
463-msgstr ""
464+msgstr "OK"
465
466 #: ../src/qml/player.qml:189
467 msgid "Pause or Resume Playhead"
468@@ -88,11 +88,11 @@
469
470 #: ../src/qml/player/VideoPlayer.qml:241
471 msgid "There are not the appropriate permissions to play a media resource."
472-msgstr ""
473+msgstr "Brak uprawnień do odtworzenia tych zasobów multimedialnych."
474
475 #: ../src/qml/player/VideoPlayer.qml:235
476 msgid "Video format not supported."
477-msgstr ""
478+msgstr "Nieobsługiwany format wideo."
479
480 #. TRANSLATORS: this refers to an unknown duration.
481 #: ../src/qml/player/TimeLine.qml:72
482
483=== modified file 'po/ro.po'
484--- po/ro.po 2014-11-06 06:35:46 +0000
485+++ po/ro.po 2015-01-16 15:44:43 +0000
486@@ -8,14 +8,14 @@
487 "Project-Id-Version: mediaplayer-app\n"
488 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
489 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
490-"PO-Revision-Date: 2014-10-07 15:58+0000\n"
491+"PO-Revision-Date: 2014-11-18 12:12+0000\n"
492 "Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
493 "Language-Team: Romanian <ro@li.org>\n"
494 "MIME-Version: 1.0\n"
495 "Content-Type: text/plain; charset=UTF-8\n"
496 "Content-Transfer-Encoding: 8bit\n"
497-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
498-"X-Generator: Launchpad (build 17223)\n"
499+"X-Launchpad-Export-Date: 2014-11-19 06:22+0000\n"
500+"X-Generator: Launchpad (build 17252)\n"
501
502 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
503 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
504@@ -54,11 +54,11 @@
505
506 #: ../data/mediaplayer-app.desktop.in.in.h:1
507 msgid "Media Player"
508-msgstr ""
509+msgstr "Player media"
510
511 #: ../data/mediaplayer-app.desktop.in.in.h:2
512 msgid "Movies;Movie Player;Video Player"
513-msgstr ""
514+msgstr "Filme;Player video;Redare video"
515
516 #: ../src/qml/player.qml:68
517 msgid ""
518
519=== modified file 'po/sl.po'
520--- po/sl.po 2014-11-06 06:35:46 +0000
521+++ po/sl.po 2015-01-16 15:44:43 +0000
522@@ -8,14 +8,14 @@
523 "Project-Id-Version: mediaplayer-app\n"
524 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
525 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
526-"PO-Revision-Date: 2014-10-07 11:03+0000\n"
527+"PO-Revision-Date: 2014-11-14 15:56+0000\n"
528 "Last-Translator: Damir Jerovšek <Unknown>\n"
529 "Language-Team: Slovenian <sl@li.org>\n"
530 "MIME-Version: 1.0\n"
531 "Content-Type: text/plain; charset=UTF-8\n"
532 "Content-Transfer-Encoding: 8bit\n"
533-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
534-"X-Generator: Launchpad (build 17223)\n"
535+"X-Launchpad-Export-Date: 2014-11-15 06:54+0000\n"
536+"X-Generator: Launchpad (build 17241)\n"
537
538 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
539 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
540@@ -54,11 +54,11 @@
541
542 #: ../data/mediaplayer-app.desktop.in.in.h:1
543 msgid "Media Player"
544-msgstr ""
545+msgstr "Predvajalnik predstavnosti"
546
547 #: ../data/mediaplayer-app.desktop.in.in.h:2
548 msgid "Movies;Movie Player;Video Player"
549-msgstr ""
550+msgstr "Filmi;Predvajalnik filmov;Predvajalnik videa"
551
552 #: ../src/qml/player.qml:68
553 msgid ""
554
555=== modified file 'po/ug.po'
556--- po/ug.po 2014-11-06 06:35:46 +0000
557+++ po/ug.po 2015-01-16 15:44:43 +0000
558@@ -8,14 +8,14 @@
559 "Project-Id-Version: mediaplayer-app\n"
560 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
561 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
562-"PO-Revision-Date: 2014-10-06 00:54+0000\n"
563+"PO-Revision-Date: 2014-11-19 04:41+0000\n"
564 "Last-Translator: Gheyret T.Kenji <Unknown>\n"
565 "Language-Team: Uyghur <ug@li.org>\n"
566 "MIME-Version: 1.0\n"
567 "Content-Type: text/plain; charset=UTF-8\n"
568 "Content-Transfer-Encoding: 8bit\n"
569-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
570-"X-Generator: Launchpad (build 17223)\n"
571+"X-Launchpad-Export-Date: 2014-11-20 06:24+0000\n"
572+"X-Generator: Launchpad (build 17252)\n"
573
574 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
575 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
576@@ -54,11 +54,11 @@
577
578 #: ../data/mediaplayer-app.desktop.in.in.h:1
579 msgid "Media Player"
580-msgstr ""
581+msgstr "ۋاسىتە قويغۇ"
582
583 #: ../data/mediaplayer-app.desktop.in.in.h:2
584 msgid "Movies;Movie Player;Video Player"
585-msgstr ""
586+msgstr "كىنولار;كىنو قويغۇ;سىن قويغۇ"
587
588 #: ../src/qml/player.qml:68
589 msgid ""
590
591=== modified file 'po/zh_TW.po'
592--- po/zh_TW.po 2014-11-06 06:35:46 +0000
593+++ po/zh_TW.po 2015-01-16 15:44:43 +0000
594@@ -8,14 +8,14 @@
595 "Project-Id-Version: mediaplayer-app\n"
596 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
597 "POT-Creation-Date: 2014-11-05 14:28-0300\n"
598-"PO-Revision-Date: 2013-10-18 05:20+0000\n"
599+"PO-Revision-Date: 2014-11-19 14:45+0000\n"
600 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
601 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
602 "MIME-Version: 1.0\n"
603 "Content-Type: text/plain; charset=UTF-8\n"
604 "Content-Transfer-Encoding: 8bit\n"
605-"X-Launchpad-Export-Date: 2014-11-06 06:35+0000\n"
606-"X-Generator: Launchpad (build 17223)\n"
607+"X-Launchpad-Export-Date: 2014-11-20 06:24+0000\n"
608+"X-Generator: Launchpad (build 17252)\n"
609
610 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
611 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
612@@ -30,11 +30,11 @@
613
614 #: ../src/qml/player/VideoPlayer.qml:238
615 msgid "A network error occurred."
616-msgstr ""
617+msgstr "發生網路錯誤。"
618
619 #: ../src/qml/player/VideoPlayer.qml:216
620 msgid "Close"
621-msgstr ""
622+msgstr "關閉"
623
624 #: ../src/qml/player.qml:67
625 msgid "Error"
626@@ -42,23 +42,23 @@
627
628 #: ../src/qml/player/VideoPlayer.qml:212
629 msgid "Error playing video"
630-msgstr ""
631+msgstr "播放影片時發生錯誤"
632
633 #: ../src/qml/player/VideoPlayer.qml:244
634 msgid "Fail to connect with playback backend."
635-msgstr ""
636+msgstr "未能連接播放後端程式。"
637
638 #: ../src/qml/player/VideoPlayer.qml:232
639 msgid "Fail to open the source video."
640-msgstr ""
641+msgstr "未能開啟來源視訊。"
642
643 #: ../data/mediaplayer-app.desktop.in.in.h:1
644 msgid "Media Player"
645-msgstr ""
646+msgstr "媒體播放"
647
648 #: ../data/mediaplayer-app.desktop.in.in.h:2
649 msgid "Movies;Movie Player;Video Player"
650-msgstr ""
651+msgstr "Movies;Movie Player;Video Player"
652
653 #: ../src/qml/player.qml:68
654 msgid ""
655@@ -68,7 +68,7 @@
656
657 #: ../src/qml/player.qml:71
658 msgid "Ok"
659-msgstr ""
660+msgstr "確定"
661
662 #: ../src/qml/player.qml:189
663 msgid "Pause or Resume Playhead"
664@@ -88,11 +88,11 @@
665
666 #: ../src/qml/player/VideoPlayer.qml:241
667 msgid "There are not the appropriate permissions to play a media resource."
668-msgstr ""
669+msgstr "未有合適權限播放媒體資源。"
670
671 #: ../src/qml/player/VideoPlayer.qml:235
672 msgid "Video format not supported."
673-msgstr ""
674+msgstr "不支援的影片格式。"
675
676 #. TRANSLATORS: this refers to an unknown duration.
677 #: ../src/qml/player/TimeLine.qml:72

Subscribers

People subscribed via source and target branches

to all changes: