Merge lp:~artmello/mediaplayer-app/mediaplayer-app-update_pot_file into lp:mediaplayer-app

Proposed by Arthur Mello
Status: Merged
Approved by: Bill Filler
Approved revision: 382
Merged at revision: 382
Proposed branch: lp:~artmello/mediaplayer-app/mediaplayer-app-update_pot_file
Merge into: lp:mediaplayer-app
Diff against target: 189 lines (+75/-62)
2 files modified
po/CMakeLists.txt (+9/-1)
po/mediaplayer-app.pot (+66/-61)
To merge this branch: bzr merge lp:~artmello/mediaplayer-app/mediaplayer-app-update_pot_file
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+282663@code.launchpad.net

Commit message

Update po/CMakeLists.txt to search for string on cpp files
Update pot file

Description of the change

Update po/CMakeLists.txt to search for string on cpp files
Update pot file

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/CMakeLists.txt'
2--- po/CMakeLists.txt 2014-06-16 14:08:17 +0000
3+++ po/CMakeLists.txt 2016-01-14 20:37:47 +0000
4@@ -6,6 +6,7 @@
5 set(POT_FILE ${DOMAIN}.pot)
6 file(GLOB PO_FILES *.po)
7 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
8+ ${CMAKE_SOURCE_DIR}/src/*.cpp
9 ${CMAKE_SOURCE_DIR}/src/*.qml)
10 list(APPEND I18N_SRCS data/${DESKTOP_FILE}.in.in)
11 list(SORT I18N_SRCS)
12@@ -26,6 +27,13 @@
13 COMMENT "Generating translation template"
14 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
15 --srcdir=${CMAKE_SOURCE_DIR} data/${DESKTOP_FILE}.in.in
16- 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 mediaplayer-app.pot ${I18N_SRCS}
17+ COMMAND ${XGETTEXT_EXECUTABLE} -o mediaplayer-app.pot
18+ --from-code=UTF-8
19+ --c++ --qt --add-comments=TRANSLATORS
20+ --keyword=tr --keyword=tr:1,2 --keyword=N_
21+ --package-name=mediaplayer-app
22+ --copyright-holder='Canonical Ltd.'
23+ -D ${CMAKE_SOURCE_DIR} ${I18N_SRCS}
24+ -D ${CMAKE_BINARY_DIR} data/${DESKTOP_FILE}.in.in
25 )
26 endif()
27
28=== modified file 'po/mediaplayer-app.pot'
29--- po/mediaplayer-app.pot 2014-11-05 22:59:33 +0000
30+++ po/mediaplayer-app.pot 2016-01-14 20:37:47 +0000
31@@ -8,7 +8,7 @@
32 msgstr ""
33 "Project-Id-Version: mediaplayer-app\n"
34 "Report-Msgid-Bugs-To: \n"
35-"POT-Creation-Date: 2014-11-05 14:28-0300\n"
36+"POT-Creation-Date: 2016-01-14 18:27-0200\n"
37 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
38 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
39 "Language-Team: LANGUAGE <LL@li.org>\n"
40@@ -17,84 +17,89 @@
41 "Content-Type: text/plain; charset=CHARSET\n"
42 "Content-Transfer-Encoding: 8bit\n"
43
44+#: src/mediaplayer.cpp:89
45+msgid "Media Player"
46+msgstr ""
47+
48+#: src/mediaplayer.cpp:200
49+msgid "Open Video"
50+msgstr ""
51+
52+#: src/mediaplayer.cpp:202
53+msgid ""
54+"Video files (*.avi *.mov *.mp4 *.divx *.ogg *.ogv *.mpeg);;All files (*)"
55+msgstr ""
56+
57+#: src/qml/player.qml:66
58+msgid "Error"
59+msgstr ""
60+
61+#: src/qml/player.qml:67
62+msgid ""
63+"No video selected to play. Connect your phone to your computer to transfer "
64+"videos to the phone. Then select video from Videos scope."
65+msgstr ""
66+
67+#: src/qml/player.qml:70
68+msgid "Ok"
69+msgstr ""
70+
71+#: src/qml/player.qml:186
72+msgid "Play / Pause"
73+msgstr ""
74+
75+#: src/qml/player.qml:187
76+msgid "Pause or Resume Playhead"
77+msgstr ""
78+
79+#: src/qml/player.qml:191
80+msgid "Share"
81+msgstr ""
82+
83+#: src/qml/player.qml:192
84+msgid "Post;Upload;Attach"
85+msgstr ""
86+
87 #. TRANSLATORS: this refers to a duration/remaining time of the video, of which you can change the order.
88 #. %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
89-#: ../src/qml/player/TimeLine.qml:52
90+#: src/qml/player/TimeLine.qml:54
91 #, qt-format
92 msgid "%1:%2:%3"
93 msgstr ""
94
95-#: ../src/qml/player/TimeLine.qml:75
96+#. TRANSLATORS: this refers to an unknown duration.
97+#: src/qml/player/TimeLine.qml:79
98+msgid "unknown"
99+msgstr ""
100+
101+#: src/qml/player/TimeLine.qml:82
102 msgid "0:00:00"
103 msgstr ""
104
105-#: ../src/qml/player/VideoPlayer.qml:238
106-msgid "A network error occurred."
107+#: src/qml/player/VideoPlayer.qml:214
108+msgid "Error playing video"
109 msgstr ""
110
111-#: ../src/qml/player/VideoPlayer.qml:216
112+#: src/qml/player/VideoPlayer.qml:218
113 msgid "Close"
114 msgstr ""
115
116-#: ../src/qml/player.qml:67
117-msgid "Error"
118-msgstr ""
119-
120-#: ../src/qml/player/VideoPlayer.qml:212
121-msgid "Error playing video"
122-msgstr ""
123-
124-#: ../src/qml/player/VideoPlayer.qml:244
125-msgid "Fail to connect with playback backend."
126-msgstr ""
127-
128-#: ../src/qml/player/VideoPlayer.qml:232
129+#: src/qml/player/VideoPlayer.qml:241
130 msgid "Fail to open the source video."
131 msgstr ""
132
133-#: ../data/mediaplayer-app.desktop.in.in.h:1
134-msgid "Media Player"
135-msgstr ""
136-
137-#: ../data/mediaplayer-app.desktop.in.in.h:2
138-msgid "Movies;Movie Player;Video Player"
139-msgstr ""
140-
141-#: ../src/qml/player.qml:68
142-msgid ""
143-"No video selected to play. Connect your phone to your computer to transfer "
144-"videos to the phone. Then select video from Videos scope."
145-msgstr ""
146-
147-#: ../src/qml/player.qml:71
148-msgid "Ok"
149-msgstr ""
150-
151-#: ../src/qml/player.qml:189
152-msgid "Pause or Resume Playhead"
153-msgstr ""
154-
155-#: ../src/qml/player.qml:188
156-msgid "Play / Pause"
157-msgstr ""
158-
159-#: ../src/qml/player.qml:194
160-msgid "Post;Upload;Attach"
161-msgstr ""
162-
163-#: ../src/qml/player.qml:193
164-msgid "Share"
165-msgstr ""
166-
167-#: ../src/qml/player/VideoPlayer.qml:241
168+#: src/qml/player/VideoPlayer.qml:244
169+msgid "Video format not supported."
170+msgstr ""
171+
172+#: src/qml/player/VideoPlayer.qml:247
173+msgid "A network error occurred."
174+msgstr ""
175+
176+#: src/qml/player/VideoPlayer.qml:250
177 msgid "There are not the appropriate permissions to play a media resource."
178 msgstr ""
179
180-#: ../src/qml/player/VideoPlayer.qml:235
181-msgid "Video format not supported."
182-msgstr ""
183-
184-#. TRANSLATORS: this refers to an unknown duration.
185-#: ../src/qml/player/TimeLine.qml:72
186-msgid "unknown"
187+#: src/qml/player/VideoPlayer.qml:253
188+msgid "Fail to connect with playback backend."
189 msgstr ""

Subscribers

People subscribed via source and target branches