Merge lp:~gotwig/audience/translations-gen-fix into lp:~audience-members/audience/trunk

Proposed by Eduard Gotwig
Status: Superseded
Proposed branch: lp:~gotwig/audience/translations-gen-fix
Merge into: lp:~audience-members/audience/trunk
Diff against target: 221 lines (+74/-41)
3 files modified
Audience/Audience.vala (+2/-2)
po/CMakeLists.txt (+1/-0)
po/audience.pot (+71/-39)
To merge this branch: bzr merge lp:~gotwig/audience/translations-gen-fix
Reviewer Review Type Date Requested Status
Cody Garver Approve
Review via email: mp+117801@code.launchpad.net

This proposal has been superseded by a proposal from 2012-08-01.

Description of the change

This branch fixes all the bugs that cause an untranslateable Audience

fix bug #989076
fix bug #1030629

To post a comment you must log in.
210. By Eduard Gotwig <email address hidden>

make pot :-)

Revision history for this message
Cody Garver (codygarver) wrote :

Great!

review: Approve
211. By Eduard Gotwig <email address hidden>

remove punctation from first two sentences

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Audience/Audience.vala'
2--- Audience/Audience.vala 2012-07-27 00:03:13 +0000
3+++ Audience/Audience.vala 2012-08-01 21:34:17 +0000
4@@ -99,7 +99,7 @@
5 if (settings.last_folder == "-1")
6 settings.last_folder = Environment.get_home_dir ();
7
8- this.welcome = new Granite.Widgets.Welcome ("No videos are open.", _("Select a source to begin playing."));
9+ this.welcome = new Granite.Widgets.Welcome (_("No videos are open."), _("Select a source to begin playing."));
10 welcome.append ("document-open", _("Open file"), _("Open a saved file."));
11
12 //welcome.append ("internet-web-browser", _("Open a location"), _("Watch something from the infinity of the internet"));
13@@ -109,7 +109,7 @@
14 welcome.append ("media-playback-start", _("Resume last video"), get_title (File.new_for_uri (filename).get_basename ()));
15 }
16 if (has_dvd)
17- welcome.append ("media-cdrom", _("Play from Dics"), _("Watch a DVD or open a file from dics"));
18+ welcome.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
19
20 /*UI*/
21 this.canvas.reactive = true;
22
23=== modified file 'po/CMakeLists.txt'
24--- po/CMakeLists.txt 2012-02-23 16:38:24 +0000
25+++ po/CMakeLists.txt 2012-08-01 21:34:17 +0000
26@@ -2,4 +2,5 @@
27 add_translations_directory (audience)
28 add_translations_catalog (audience
29 ../Audience
30+ ../Audience/Widgets
31 )
32
33=== modified file 'po/audience.pot'
34--- po/audience.pot 2012-07-26 23:17:03 +0000
35+++ po/audience.pot 2012-08-01 21:34:17 +0000
36@@ -8,7 +8,7 @@
37 msgstr ""
38 "Project-Id-Version: PACKAGE VERSION\n"
39 "Report-Msgid-Bugs-To: \n"
40-"POT-Creation-Date: 2012-07-27 01:16+0200\n"
41+"POT-Creation-Date: 2012-08-01 23:30+0200\n"
42 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
43 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
44 "Language-Team: LANGUAGE <LL@li.org>\n"
45@@ -17,106 +17,138 @@
46 "Content-Type: text/plain; charset=CHARSET\n"
47 "Content-Transfer-Encoding: 8bit\n"
48
49-#: /home/tom/Programming/audience/po/../Audience/desktop-launcher.vala:5
50-msgid "Play your media"
51-msgstr ""
52-
53-#: /home/tom/Programming/audience/po/../Audience/desktop-launcher.vala:6
54-msgid "Media Player"
55-msgstr ""
56-
57-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:100
58+#: /home/gotwig/audience/po/../Audience/Audience.vala:102
59+msgid "No videos are open."
60+msgstr ""
61+
62+#: /home/gotwig/audience/po/../Audience/Audience.vala:102
63 msgid "Select a source to begin playing."
64 msgstr ""
65
66-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:101
67+#: /home/gotwig/audience/po/../Audience/Audience.vala:103
68 msgid "Open file"
69 msgstr ""
70
71-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:101
72+#: /home/gotwig/audience/po/../Audience/Audience.vala:103
73 msgid "Open a saved file."
74 msgstr ""
75
76-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:107
77+#: /home/gotwig/audience/po/../Audience/Audience.vala:109
78 msgid "Resume last video"
79 msgstr ""
80
81-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:110
82-msgid "Play from Dics"
83-msgstr ""
84-
85-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:110
86-msgid "Watch a DVD or open a file from dics"
87-msgstr ""
88-
89-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:133
90+#: /home/gotwig/audience/po/../Audience/Audience.vala:112
91+msgid "Play from Disc"
92+msgstr ""
93+
94+#: /home/gotwig/audience/po/../Audience/Audience.vala:112
95+msgid "Watch a DVD or open a file from disc"
96+msgstr ""
97+
98+#: /home/gotwig/audience/po/../Audience/Audience.vala:135
99 msgid "Play"
100 msgstr ""
101
102-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:134
103-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:650
104+#: /home/gotwig/audience/po/../Audience/Audience.vala:136
105+#: /home/gotwig/audience/po/../Audience/Audience.vala:657
106 msgid "Open"
107 msgstr ""
108
109-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:135
110+#: /home/gotwig/audience/po/../Audience/Audience.vala:137
111 msgid "Sidebar"
112 msgstr ""
113
114-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:136
115+#: /home/gotwig/audience/po/../Audience/Audience.vala:138
116 msgid "Leave Fullscreen"
117 msgstr ""
118
119-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:195
120+#: /home/gotwig/audience/po/../Audience/Audience.vala:198
121 msgid "Open location"
122 msgstr ""
123
124-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:204
125+#: /home/gotwig/audience/po/../Audience/Audience.vala:207
126 msgid "Choose location"
127 msgstr ""
128
129-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:245
130+#: /home/gotwig/audience/po/../Audience/Audience.vala:248
131 msgid "Error"
132 msgstr ""
133
134-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:255
135+#: /home/gotwig/audience/po/../Audience/Audience.vala:258
136 msgid "Oops! Audience can't play this file!"
137 msgstr ""
138
139-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:282
140+#: /home/gotwig/audience/po/../Audience/Audience.vala:285
141 msgid ""
142 "Some media files need extra software to be played. Audience can install this "
143 "software automatically."
144 msgstr ""
145
146-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:288
147+#: /home/gotwig/audience/po/../Audience/Audience.vala:291
148 #, c-format
149 msgid "Audience needs %s to play this file."
150 msgstr ""
151
152-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:291
153+#: /home/gotwig/audience/po/../Audience/Audience.vala:294
154 msgid "Don't install"
155 msgstr ""
156
157-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:292
158+#: /home/gotwig/audience/po/../Audience/Audience.vala:295
159 msgid "Install"
160 msgstr ""
161
162-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:468
163+#: /home/gotwig/audience/po/../Audience/Audience.vala:471
164 msgid "Add from Harddrive"
165 msgstr ""
166
167-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:470
168+#: /home/gotwig/audience/po/../Audience/Audience.vala:473
169 msgid "Play a DVD"
170 msgstr ""
171
172-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:472
173+#: /home/gotwig/audience/po/../Audience/Audience.vala:475
174 msgid "Network File"
175 msgstr ""
176
177-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:656
178+#: /home/gotwig/audience/po/../Audience/Audience.vala:663
179 msgid "All files"
180 msgstr ""
181
182-#: /home/tom/Programming/audience/po/../Audience/Audience.vala:660
183+#: /home/gotwig/audience/po/../Audience/Audience.vala:667
184 msgid "Video files"
185 msgstr ""
186+
187+#: /home/gotwig/audience/po/../Audience/desktop-launcher.vala:5
188+msgid "Play your media"
189+msgstr ""
190+
191+#: /home/gotwig/audience/po/../Audience/desktop-launcher.vala:6
192+msgid "Media Player"
193+msgstr ""
194+
195+#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:54
196+msgid "Language"
197+msgstr ""
198+
199+#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:55
200+msgid "Subtitles"
201+msgstr ""
202+
203+#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:94
204+msgid "Playlist"
205+msgstr ""
206+
207+#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:95
208+msgid "Options"
209+msgstr ""
210+
211+#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:97
212+msgid "Details"
213+msgstr ""
214+
215+#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:218
216+msgid "Default"
217+msgstr ""
218+
219+#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:231
220+msgid "None"
221+msgstr ""

Subscribers

People subscribed via source and target branches