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
=== added file 'Audience/desktop-launcher.vala'
--- Audience/desktop-launcher.vala 1970-01-01 00:00:00 +0000
+++ Audience/desktop-launcher.vala 2012-06-08 04:19:17 +0000
@@ -0,0 +1,7 @@
1namespace DesktopLauncher {
2 /* Translatable launcher (.desktop) strings to be added to */
3 /* template (.pot) file. These strings MUST reflect any */
4 /* changes in these launcher keys in .desktop file. */
5 public const string COMMENT = N_("Play your media");
6 public const string GENERIC_NAME = N_("Media Player");
7}
08
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-05-12 23:02:02 +0000
+++ CMakeLists.txt 2012-06-08 04:19:17 +0000
@@ -45,6 +45,7 @@
45 Audience/Widgets/MediaSlider.vala45 Audience/Widgets/MediaSlider.vala
46 Audience/Widgets/TopPanel.vala46 Audience/Widgets/TopPanel.vala
47 Audience/Widgets/Playlist.vala47 Audience/Widgets/Playlist.vala
48 Audience/desktop-launcher.vala
48PACKAGES49PACKAGES
49 gtk+-3.050 gtk+-3.0
50 granite51 granite
5152
=== modified file 'INSTALL'
--- INSTALL 2011-12-13 18:08:48 +0000
+++ INSTALL 2012-06-08 04:19:17 +0000
@@ -7,7 +7,7 @@
7 bzr branch lp:audience7 bzr branch lp:audience
8 cd audience8 cd audience
9 mkdir build; cd build9 mkdir build; cd build
10 cmake ..10 cmake .. -DCMAKE_INSTALL_PREFIX=/usr
11 make11 make
12 ./audience12 ./audience
1313
1414
=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake 2011-12-13 18:08:48 +0000
+++ cmake/Translations.cmake 2012-06-08 04:19:17 +0000
@@ -36,6 +36,6 @@
3636
37 add_custom_command (TARGET pot COMMAND37 add_custom_command (TARGET pot COMMAND
38 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot38 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
39 ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-839 ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
40 )40 )
41endmacro()41endmacro()
4242
=== modified file 'data/audience.desktop'
--- data/audience.desktop 2012-05-12 22:27:33 +0000
+++ data/audience.desktop 2012-06-08 04:19:17 +0000
@@ -1,7 +1,7 @@
1[Desktop Entry]1[Desktop Entry]
2Version=1.02Version=1.0
3Name=Audience3Name=Audience
4GenericName=Audience Media Player4GenericName=Media Player
5Comment=Play your media5Comment=Play your media
6Exec=audience %U6Exec=audience %U
7Icon=audience7Icon=audience
@@ -10,3 +10,4 @@
10Type=Application10Type=Application
11Categories=AudioVideo;Video;Player;TV;11Categories=AudioVideo;Video;Player;TV;
12MimeType=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;12MimeType=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;
13X-GNOME-Gettext-Domain=audience
1314
=== modified file 'po/audience.pot'
--- po/audience.pot 2012-05-12 23:06:09 +0000
+++ po/audience.pot 2012-06-08 04:19:17 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-05-13 01:02+0200\n"11"POT-Creation-Date: 2012-06-07 08:35-0700\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,98 +17,106 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: /home/tom/Programming/audience/po/../Audience/Audience.vala:10020#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/desktop-launcher.vala:5
21msgid "Play your media"
22msgstr ""
23
24#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/desktop-launcher.vala:6
25msgid "Media Player"
26msgstr ""
27
28#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:100
21msgid "Select a source start playing."29msgid "Select a source start playing."
22msgstr ""30msgstr ""
2331
24#: /home/tom/Programming/audience/po/../Audience/Audience.vala:10132#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:101
25msgid "Open file"33msgid "Open file"
26msgstr ""34msgstr ""
2735
28#: /home/tom/Programming/audience/po/../Audience/Audience.vala:10136#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:101
29msgid "Open a saved file."37msgid "Open a saved file."
30msgstr ""38msgstr ""
3139
32#: /home/tom/Programming/audience/po/../Audience/Audience.vala:10840#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:107
33msgid "Resume last video"41msgid "Resume last video"
34msgstr ""42msgstr ""
3543
36#: /home/tom/Programming/audience/po/../Audience/Audience.vala:11244#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:110
37msgid "Watch a DVD"45msgid "Watch a DVD"
38msgstr ""46msgstr ""
3947
40#: /home/tom/Programming/audience/po/../Audience/Audience.vala:11248#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:110
41msgid "Open a film"49msgid "Open a film"
42msgstr ""50msgstr ""
4351
44#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13352#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:133
45msgid "Play"53msgid "Play"
46msgstr ""54msgstr ""
4755
48#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13456#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:134
49#: /home/tom/Programming/audience/po/../Audience/Audience.vala:64257#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:650
50msgid "Open"58msgid "Open"
51msgstr ""59msgstr ""
5260
53#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13561#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:135
54msgid "Sidebar"62msgid "Sidebar"
55msgstr ""63msgstr ""
5664
57#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13665#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:136
58msgid "Leave Fullscreen"66msgid "Leave Fullscreen"
59msgstr ""67msgstr ""
6068
61#: /home/tom/Programming/audience/po/../Audience/Audience.vala:18869#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:195
62msgid "Open location"70msgid "Open location"
63msgstr ""71msgstr ""
6472
65#: /home/tom/Programming/audience/po/../Audience/Audience.vala:19773#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:204
66msgid "Choose location"74msgid "Choose location"
67msgstr ""75msgstr ""
6876
69#: /home/tom/Programming/audience/po/../Audience/Audience.vala:23977#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:245
70msgid "Error"78msgid "Error"
71msgstr ""79msgstr ""
7280
73#: /home/tom/Programming/audience/po/../Audience/Audience.vala:24981#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:255
74msgid "Oops! Audience can't play this file!"82msgid "Oops! Audience can't play this file!"
75msgstr ""83msgstr ""
7684
77#: /home/tom/Programming/audience/po/../Audience/Audience.vala:27685#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:282
78msgid ""86msgid ""
79"Some media files need extra software to be played. Audience can install this "87"Some media files need extra software to be played. Audience can install this "
80"software automatically."88"software automatically."
81msgstr ""89msgstr ""
8290
83#: /home/tom/Programming/audience/po/../Audience/Audience.vala:28291#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:288
84#, c-format92#, c-format
85msgid "Audience needs %s to play this file."93msgid "Audience needs %s to play this file."
86msgstr ""94msgstr ""
8795
88#: /home/tom/Programming/audience/po/../Audience/Audience.vala:28596#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:291
89msgid "Don't install"97msgid "Don't install"
90msgstr ""98msgstr ""
9199
92#: /home/tom/Programming/audience/po/../Audience/Audience.vala:286100#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:292
93msgid "Install"101msgid "Install"
94msgstr ""102msgstr ""
95103
96#: /home/tom/Programming/audience/po/../Audience/Audience.vala:461104#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:468
97msgid "Add from Harddrive"105msgid "Add from Harddrive"
98msgstr ""106msgstr ""
99107
100#: /home/tom/Programming/audience/po/../Audience/Audience.vala:463108#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:470
101msgid "Play a DVD"109msgid "Play a DVD"
102msgstr ""110msgstr ""
103111
104#: /home/tom/Programming/audience/po/../Audience/Audience.vala:465112#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:472
105msgid "Network File"113msgid "Network File"
106msgstr ""114msgstr ""
107115
108#: /home/tom/Programming/audience/po/../Audience/Audience.vala:648116#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:656
109msgid "All files"117msgid "All files"
110msgstr ""118msgstr ""
111119
112#: /home/tom/Programming/audience/po/../Audience/Audience.vala:652120#: /home/ttosttos/Projects/elementary/Bugs/audience-fix-1004294/po/../Audience/Audience.vala:660
113msgid "Video files"121msgid "Video files"
114msgstr ""122msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: