Audience

Merge lp:~codygarver/audience/fix-1169337 into lp:~audience-members/audience/trunk

  1. fix-1169337
  2. Merge into trunk
Proposed by Cody Garver
Status: Merged
Merged at revision: 262
Proposed branch: lp:~codygarver/audience/fix-1169337
Merge into: lp:~audience-members/audience/trunk
Diff against target: 221 lines (+63/-76)
2 files modified
Audience/Widgets/TagView.vala (+1/-1)
po/audience.pot (+62/-75)
To merge this branch: bzr merge lp:~codygarver/audience/fix-1169337
Reviewer Review Type Date Requested Status
Audience Members Pending
Review via email: mp+159022@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Audience/Widgets/TagView.vala'
2--- Audience/Widgets/TagView.vala 2013-04-07 18:53:17 +0000
3+++ Audience/Widgets/TagView.vala 2013-04-15 21:24:29 +0000
4@@ -56,7 +56,7 @@
5 var setupgrid = new Gtk.Grid ();
6 this.languages = new Gtk.ComboBoxText ();
7 this.subtitles = new Gtk.ComboBoxText ();
8- this.external_subtitle_file = new Gtk.FileChooserButton ("External Subtitle", Gtk.FileChooserAction.OPEN);
9+ this.external_subtitle_file = new Gtk.FileChooserButton (_("External Subtitle"), Gtk.FileChooserAction.OPEN);
10 var lang_lbl = new LLabel.right (_("Language")+":");
11 var sub_lbl = new LLabel.right (_("Subtitles")+":");
12 var sub_ext_lbl = new LLabel.right (_("External Subtitles") + ":");
13
14=== modified file 'po/audience.pot'
15--- po/audience.pot 2012-08-16 04:19:05 +0000
16+++ po/audience.pot 2013-04-15 21:24:29 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: PACKAGE VERSION\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2012-08-15 23:19-0500\n"
22+"POT-Creation-Date: 2013-04-15 16:18-0500\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -17,103 +17,59 @@
27 "Content-Type: text/plain; charset=CHARSET\n"
28 "Content-Transfer-Encoding: 8bit\n"
29
30-#: /home/codygarver/audience/po/../Audience/Audience.vala:102
31-msgid "No videos are open"
32-msgstr ""
33-
34-#: /home/codygarver/audience/po/../Audience/Audience.vala:102
35-msgid "Select a source to begin playing"
36-msgstr ""
37-
38-#: /home/codygarver/audience/po/../Audience/Audience.vala:103
39+#: /home/codygarver/audience/po/../Audience/Audience.vala:88
40+msgid "Select a source to begin playing."
41+msgstr ""
42+
43+#: /home/codygarver/audience/po/../Audience/Audience.vala:89
44 msgid "Open file"
45 msgstr ""
46
47-#: /home/codygarver/audience/po/../Audience/Audience.vala:103
48+#: /home/codygarver/audience/po/../Audience/Audience.vala:89
49 msgid "Open a saved file."
50 msgstr ""
51
52-#: /home/codygarver/audience/po/../Audience/Audience.vala:109
53+#: /home/codygarver/audience/po/../Audience/Audience.vala:95
54 msgid "Resume last video"
55 msgstr ""
56
57-#: /home/codygarver/audience/po/../Audience/Audience.vala:112
58+#: /home/codygarver/audience/po/../Audience/Audience.vala:99
59 msgid "Play from Disc"
60 msgstr ""
61
62-#: /home/codygarver/audience/po/../Audience/Audience.vala:112
63+#: /home/codygarver/audience/po/../Audience/Audience.vala:99
64 msgid "Watch a DVD or open a file from disc"
65 msgstr ""
66
67-#: /home/codygarver/audience/po/../Audience/Audience.vala:135
68-msgid "Play"
69-msgstr ""
70-
71-#: /home/codygarver/audience/po/../Audience/Audience.vala:136
72-#: /home/codygarver/audience/po/../Audience/Audience.vala:658
73-msgid "Open"
74-msgstr ""
75-
76-#: /home/codygarver/audience/po/../Audience/Audience.vala:137
77-msgid "Sidebar"
78-msgstr ""
79-
80-#: /home/codygarver/audience/po/../Audience/Audience.vala:138
81-msgid "Leave Fullscreen"
82-msgstr ""
83-
84-#: /home/codygarver/audience/po/../Audience/Audience.vala:199
85+#: /home/codygarver/audience/po/../Audience/Audience.vala:170
86 msgid "Open location"
87 msgstr ""
88
89-#: /home/codygarver/audience/po/../Audience/Audience.vala:208
90+#: /home/codygarver/audience/po/../Audience/Audience.vala:179
91 msgid "Choose location"
92 msgstr ""
93
94-#: /home/codygarver/audience/po/../Audience/Audience.vala:249
95-msgid "Error"
96-msgstr ""
97-
98-#: /home/codygarver/audience/po/../Audience/Audience.vala:259
99-msgid "Oops! Audience can't play this file!"
100-msgstr ""
101-
102-#: /home/codygarver/audience/po/../Audience/Audience.vala:286
103-msgid ""
104-"Some media files need extra software to be played. Audience can install this "
105-"software automatically."
106-msgstr ""
107-
108-#: /home/codygarver/audience/po/../Audience/Audience.vala:292
109-#, c-format
110-msgid "Audience needs %s to play this file."
111-msgstr ""
112-
113-#: /home/codygarver/audience/po/../Audience/Audience.vala:295
114-msgid "Don't install"
115-msgstr ""
116-
117-#: /home/codygarver/audience/po/../Audience/Audience.vala:296
118-msgid "Install"
119-msgstr ""
120-
121-#: /home/codygarver/audience/po/../Audience/Audience.vala:472
122+#: /home/codygarver/audience/po/../Audience/Audience.vala:289
123 msgid "Add from Harddrive"
124 msgstr ""
125
126-#: /home/codygarver/audience/po/../Audience/Audience.vala:474
127+#: /home/codygarver/audience/po/../Audience/Audience.vala:291
128 msgid "Play a DVD"
129 msgstr ""
130
131-#: /home/codygarver/audience/po/../Audience/Audience.vala:476
132+#: /home/codygarver/audience/po/../Audience/Audience.vala:293
133 msgid "Network File"
134 msgstr ""
135
136-#: /home/codygarver/audience/po/../Audience/Audience.vala:664
137+#: /home/codygarver/audience/po/../Audience/Audience.vala:549
138+msgid "Open"
139+msgstr ""
140+
141+#: /home/codygarver/audience/po/../Audience/Audience.vala:554
142 msgid "All files"
143 msgstr ""
144
145-#: /home/codygarver/audience/po/../Audience/Audience.vala:668
146+#: /home/codygarver/audience/po/../Audience/Audience.vala:558
147 msgid "Video files"
148 msgstr ""
149
150@@ -125,30 +81,61 @@
151 msgid "Media Player"
152 msgstr ""
153
154-#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:54
155+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:59
156+msgid "External Subtitle"
157+msgstr ""
158+
159+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:60
160 msgid "Language"
161 msgstr ""
162
163-#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:55
164+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:61
165 msgid "Subtitles"
166 msgstr ""
167
168-#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:94
169+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:62
170+msgid "External Subtitles"
171+msgstr ""
172+
173+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:92
174 msgid "Playlist"
175 msgstr ""
176
177-#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:95
178+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:93
179 msgid "Options"
180 msgstr ""
181
182-#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:97
183-msgid "Details"
184-msgstr ""
185-
186-#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:218
187+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:242
188 msgid "Default"
189 msgstr ""
190
191-#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:231
192+#: /home/codygarver/audience/po/../Audience/Widgets/TagView.vala:255
193 msgid "None"
194 msgstr ""
195+
196+#: /home/codygarver/audience/po/../Audience/Widgets/VideoPlayer.vala:523
197+msgid "Error"
198+msgstr ""
199+
200+#: /home/codygarver/audience/po/../Audience/Widgets/VideoPlayer.vala:531
201+msgid "Oops! Audience can't play this file!"
202+msgstr ""
203+
204+#: /home/codygarver/audience/po/../Audience/Widgets/VideoPlayer.vala:555
205+msgid ""
206+"Some media files need extra software to be played. Audience can install this "
207+"software automatically."
208+msgstr ""
209+
210+#: /home/codygarver/audience/po/../Audience/Widgets/VideoPlayer.vala:561
211+#, c-format
212+msgid "Audience needs %s to play this file."
213+msgstr ""
214+
215+#: /home/codygarver/audience/po/../Audience/Widgets/VideoPlayer.vala:564
216+msgid "Don't install"
217+msgstr ""
218+
219+#: /home/codygarver/audience/po/../Audience/Widgets/VideoPlayer.vala:565
220+msgid "Install"
221+msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: