Merge lp:~ttosttos/audience/fix-1004294 into lp:~audience-members/audience/trunk

Proposed by ttosttos on 2012-06-07
Status: Merged
Merged at revision: 179
Proposed branch: lp:~ttosttos/audience/fix-1004294
Merge into: lp:~audience-members/audience/trunk
Diff against target: 210 lines (+45/-28)
6 files modified
Audience/desktop-launcher.vala (+7/-0)
CMakeLists.txt (+1/-0)
INSTALL (+1/-1)
cmake/Translations.cmake (+1/-1)
data/audience.desktop (+2/-1)
po/audience.pot (+33/-25)
To merge this branch: bzr merge lp:~ttosttos/audience/fix-1004294
Reviewer Review Type Date Requested Status
Cody Garver 2012-06-07 Approve on 2012-06-23
Review via email: mp+109173@code.launchpad.net

Description of the change

- Added gettext domain key to audience.desktop
- created desktop-launcher.vala to have xgettext automatically add launcher strings to translation template
- Updated audience.pot so it includes launcher strings
- edited GenericName in launcher to make it compliant with elementary HIG

To post a comment you must log in.
lp:~ttosttos/audience/fix-1004294 updated on 2012-06-08
174. By ttosttos on 2012-06-08

Adds missing file with launcher strings

Eduard Gotwig (gotwig) wrote :

Please merge that nice thing :-) Would fix some important bugs for audience users around the world

Eduard Gotwig (gotwig) wrote :

Would be nice if you could make "No videos are open" translateable.

ttosttos (ttosttos) wrote :

Earlier merge requests has been sitting for some time. I'd appreciate if someone can review and comment or otherwise merge. Thanks.

Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Audience/desktop-launcher.vala'
2--- Audience/desktop-launcher.vala 1970-01-01 00:00:00 +0000
3+++ Audience/desktop-launcher.vala 2012-06-08 04:19:17 +0000
4@@ -0,0 +1,7 @@
5+namespace DesktopLauncher {
6+ /* Translatable launcher (.desktop) strings to be added to */
7+ /* template (.pot) file. These strings MUST reflect any */
8+ /* changes in these launcher keys in .desktop file. */
9+ public const string COMMENT = N_("Play your media");
10+ public const string GENERIC_NAME = N_("Media Player");
11+}
12
13=== modified file 'CMakeLists.txt'
14--- CMakeLists.txt 2012-05-12 23:02:02 +0000
15+++ CMakeLists.txt 2012-06-08 04:19:17 +0000
16@@ -45,6 +45,7 @@
17 Audience/Widgets/MediaSlider.vala
18 Audience/Widgets/TopPanel.vala
19 Audience/Widgets/Playlist.vala
20+ Audience/desktop-launcher.vala
21 PACKAGES
22 gtk+-3.0
23 granite
24
25=== modified file 'INSTALL'
26--- INSTALL 2011-12-13 18:08:48 +0000
27+++ INSTALL 2012-06-08 04:19:17 +0000
28@@ -7,7 +7,7 @@
29 bzr branch lp:audience
30 cd audience
31 mkdir build; cd build
32- cmake ..
33+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
34 make
35 ./audience
36
37
38=== modified file 'cmake/Translations.cmake'
39--- cmake/Translations.cmake 2011-12-13 18:08:48 +0000
40+++ cmake/Translations.cmake 2012-06-08 04:19:17 +0000
41@@ -36,6 +36,6 @@
42
43 add_custom_command (TARGET pot COMMAND
44 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
45- ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
46+ ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
47 )
48 endmacro()
49
50=== modified file 'data/audience.desktop'
51--- data/audience.desktop 2012-05-12 22:27:33 +0000
52+++ data/audience.desktop 2012-06-08 04:19:17 +0000
53@@ -1,7 +1,7 @@
54 [Desktop Entry]
55 Version=1.0
56 Name=Audience
57-GenericName=Audience Media Player
58+GenericName=Media Player
59 Comment=Play your media
60 Exec=audience %U
61 Icon=audience
62@@ -10,3 +10,4 @@
63 Type=Application
64 Categories=AudioVideo;Video;Player;TV;
65 MimeType=application/x-musepack;application/musepack;application/x-ape;application/x-id3;application/ogg;application/x-ogg;application/x-vorbis+ogg;application/x-flac;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;application/vnd.rn-realmedia;video/vnd.rn-realvideo;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;application/x-drm-v2;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/3gpp;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;video/x-matroska;video/matroska;video/x-mng;video/webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg;
66+X-GNOME-Gettext-Domain=audience
67
68=== modified file 'po/audience.pot'
69--- po/audience.pot 2012-05-12 23:06:09 +0000
70+++ po/audience.pot 2012-06-08 04:19:17 +0000
71@@ -8,7 +8,7 @@
72 msgstr ""
73 "Project-Id-Version: PACKAGE VERSION\n"
74 "Report-Msgid-Bugs-To: \n"
75-"POT-Creation-Date: 2012-05-13 01:02+0200\n"
76+"POT-Creation-Date: 2012-06-07 08:35-0700\n"
77 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
78 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
79 "Language-Team: LANGUAGE <LL@li.org>\n"
80@@ -17,98 +17,106 @@
81 "Content-Type: text/plain; charset=CHARSET\n"
82 "Content-Transfer-Encoding: 8bit\n"
83
84-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:100
85+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/desktop-launcher.vala:5
86+msgid "Play your media"
87+msgstr ""
88+
89+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/desktop-launcher.vala:6
90+msgid "Media Player"
91+msgstr ""
92+
93+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:100
94 msgid "Select a source start playing."
95 msgstr ""
96
97-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:101
98+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:101
99 msgid "Open file"
100 msgstr ""
101
102-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:101
103+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:101
104 msgid "Open a saved file."
105 msgstr ""
106
107-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:108
108+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:107
109 msgid "Resume last video"
110 msgstr ""
111
112-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:112
113+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:110
114 msgid "Watch a DVD"
115 msgstr ""
116
117-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:112
118+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:110
119 msgid "Open a film"
120 msgstr ""
121
122-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:133
123+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:133
124 msgid "Play"
125 msgstr ""
126
127-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:134
128-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:642
129+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:134
130+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:650
131 msgid "Open"
132 msgstr ""
133
134-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:135
135+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:135
136 msgid "Sidebar"
137 msgstr ""
138
139-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:136
140+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:136
141 msgid "Leave Fullscreen"
142 msgstr ""
143
144-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:188
145+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:195
146 msgid "Open location"
147 msgstr ""
148
149-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:197
150+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:204
151 msgid "Choose location"
152 msgstr ""
153
154-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:239
155+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:245
156 msgid "Error"
157 msgstr ""
158
159-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:249
160+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:255
161 msgid "Oops! Audience can't play this file!"
162 msgstr ""
163
164-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:276
165+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:282
166 msgid ""
167 "Some media files need extra software to be played. Audience can install this "
168 "software automatically."
169 msgstr ""
170
171-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:282
172+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:288
173 #, c-format
174 msgid "Audience needs %s to play this file."
175 msgstr ""
176
177-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:285
178+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:291
179 msgid "Don't install"
180 msgstr ""
181
182-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:286
183+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:292
184 msgid "Install"
185 msgstr ""
186
187-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:461
188+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:468
189 msgid "Add from Harddrive"
190 msgstr ""
191
192-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:463
193+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:470
194 msgid "Play a DVD"
195 msgstr ""
196
197-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:465
198+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:472
199 msgid "Network File"
200 msgstr ""
201
202-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:648
203+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:656
204 msgid "All files"
205 msgstr ""
206
207-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:652
208+#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:660
209 msgid "Video files"
210 msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: