Audience

Merge lp:~leonardolemos/audience/fix-translator-credits into lp:~audience-members/audience/trunk

  1. fix-translator-credits
  2. Merge into trunk
Proposed by Leonardo Lemos
Status: Merged
Approved by: Cody Garver
Approved revision: 597
Merged at revision: 599
Proposed branch: lp:~leonardolemos/audience/fix-translator-credits
Merge into: lp:~audience-members/audience/trunk
Diff against target: 294 lines (+87/-119)
2 files modified
po/audience.pot (+83/-113)
src/Audience.vala (+4/-6)
To merge this branch: bzr merge lp:~leonardolemos/audience/fix-translator-credits
Reviewer Review Type Date Requested Status
Audience Members Pending
Review via email: mp+300266@code.launchpad.net

Commit message

Fix the Translator's Credits appearance in the About Dialog and update the app years

Description of the change

This branch fixes the Translator's Credits appearance in the About Dialog and update the app years.

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
=== modified file 'po/audience.pot'
--- po/audience.pot 2015-12-03 17:10:48 +0000
+++ po/audience.pot 2016-07-17 00:09:38 +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: 2015-12-03 15:10-0200\n"11"POT-Creation-Date: 2016-07-17 04:08+0400\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,7 +17,59 @@
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#: ../src/Widgets/SettingsPopover.vala:35 ../src/Audience.vala:25320#: ../src/Widgets/BottomBar.vala:52 ../src/Widgets/BottomBar.vala:106
21msgid "Play"
22msgstr ""
23
24#: ../src/Widgets/BottomBar.vala:56
25msgid "Playlist"
26msgstr ""
27
28#: ../src/Widgets/BottomBar.vala:60
29msgid "Settings"
30msgstr ""
31
32#: ../src/Widgets/BottomBar.vala:102
33msgid "Pause"
34msgstr ""
35
36#: ../src/Widgets/BottomBar.vala:127
37msgid "Unfullscreen"
38msgstr ""
39
40#: ../src/Widgets/WelcomePage.vala:5
41msgid "No Videos Open"
42msgstr ""
43
44#: ../src/Widgets/WelcomePage.vala:5
45msgid "Select a source to begin playing."
46msgstr ""
47
48#: ../src/Widgets/WelcomePage.vala:9 ../src/Widgets/PlaylistPopover.vala:35
49msgid "Open file"
50msgstr ""
51
52#: ../src/Widgets/WelcomePage.vala:9
53msgid "Open a saved file."
54msgstr ""
55
56#: ../src/Widgets/WelcomePage.vala:19
57msgid "Replay last video"
58msgstr ""
59
60#: ../src/Widgets/WelcomePage.vala:21
61msgid "Resume last video"
62msgstr ""
63
64#: ../src/Widgets/WelcomePage.vala:36 ../src/Widgets/PlaylistPopover.vala:37
65msgid "Play from Disc"
66msgstr ""
67
68#: ../src/Widgets/WelcomePage.vala:36
69msgid "Watch a DVD or open a file from disc"
70msgstr ""
71
72#: ../src/Widgets/SettingsPopover.vala:35 ../src/Window.vala:258
21msgid "All files"73msgid "All files"
22msgstr ""74msgstr ""
2375
@@ -42,157 +94,75 @@
42msgid "External Subtitles:"94msgid "External Subtitles:"
43msgstr ""95msgstr ""
4496
97#: ../src/Widgets/SettingsPopover.vala:108
98msgid "None"
99msgstr ""
100
45#: ../src/Widgets/SettingsPopover.vala:123101#: ../src/Widgets/SettingsPopover.vala:123
46msgid "None"
47msgstr ""
48
49#: ../src/Widgets/SettingsPopover.vala:154
50msgid "Default"102msgid "Default"
51msgstr ""103msgstr ""
52104
53#: ../src/Widgets/PlaylistPopover.vala:35 ../src/Widgets/WelcomePage.vala:5105#: ../src/Widgets/PlaylistPopover.vala:41
54msgid "Open file"106#: ../src/Widgets/PlaylistPopover.vala:67
55msgstr ""
56
57#: ../src/Widgets/PlaylistPopover.vala:37 ../src/Widgets/WelcomePage.vala:23
58msgid "Play from Disc"
59msgstr ""
60
61#: ../src/Widgets/PlaylistPopover.vala:43
62#: ../src/Widgets/PlaylistPopover.vala:70
63msgid "Enable Repeat"107msgid "Enable Repeat"
64msgstr ""108msgstr ""
65109
66#: ../src/Widgets/PlaylistPopover.vala:67110#: ../src/Widgets/PlaylistPopover.vala:64
67msgid "Disable Repeat"111msgid "Disable Repeat"
68msgstr ""112msgstr ""
69113
70#: ../src/Widgets/BottomBar.vala:55 ../src/Widgets/BottomBar.vala:134
71msgid "Play"
72msgstr ""
73
74#: ../src/Widgets/BottomBar.vala:59
75msgid "Playlist"
76msgstr ""
77
78#: ../src/Widgets/BottomBar.vala:63
79msgid "Settings"
80msgstr ""
81
82#: ../src/Widgets/BottomBar.vala:119
83msgid "Unfullscreen"
84msgstr ""
85
86#: ../src/Widgets/BottomBar.vala:130
87msgid "Pause"
88msgstr ""
89
90#: ../src/Widgets/VideoPlayer.vala:378
91msgid "Error"
92msgstr ""
93
94#: ../src/Widgets/VideoPlayer.vala:378
95msgid "_OK"
96msgstr ""
97
98#: ../src/Widgets/VideoPlayer.vala:384
99msgid "Oops! Audience can't play this file!"
100msgstr ""
101
102#: ../src/Widgets/VideoPlayer.vala:404
103msgid ""
104"Some media files need extra software to be played. Audience can install this "
105"software automatically."
106msgstr ""
107
108#: ../src/Widgets/VideoPlayer.vala:409
109msgid "Audience needs %s to play this file."
110msgstr ""
111
112#: ../src/Widgets/VideoPlayer.vala:416
113msgid "Don't install"
114msgstr ""
115
116#: ../src/Widgets/VideoPlayer.vala:417
117msgid "Install"
118msgstr ""
119
120#: ../src/Widgets/WelcomePage.vala:4
121msgid "No Videos Open"
122msgstr ""
123
124#: ../src/Widgets/WelcomePage.vala:4
125msgid "Select a source to begin playing."
126msgstr ""
127
128#: ../src/Widgets/WelcomePage.vala:5
129msgid "Open a saved file."
130msgstr ""
131
132#: ../src/Widgets/WelcomePage.vala:17
133msgid "Replay last video"
134msgstr ""
135
136#: ../src/Widgets/WelcomePage.vala:19
137msgid "Resume last video"
138msgstr ""
139
140#: ../src/Widgets/WelcomePage.vala:23
141msgid "Watch a DVD or open a file from disc"
142msgstr ""
143
144#. / TRANSLATORS: This is the name of the application shown in the application launcher. Some distributors (e.g. elementary OS) choose to display it instead of the brand name "Audience".114#. / TRANSLATORS: This is the name of the application shown in the application launcher. Some distributors (e.g. elementary OS) choose to display it instead of the brand name "Audience".
145#: ../src/Audience.vala:44115#: ../src/Audience.vala:32
146msgid "Videos"116msgid "Videos"
147msgstr ""117msgstr ""
148118
149#. / TRANSLATORS: These are the keywords used when searching for this application in an application store or launcher.119#. / TRANSLATORS: These are the keywords used when searching for this application in an application store or launcher.
150#: ../src/Audience.vala:46120#: ../src/Audience.vala:34
151msgid "Audience;Video;Player;Movies;"121msgid "Audience;Video;Player;Movies;"
152msgstr ""122msgstr ""
153123
154#: ../src/Audience.vala:47124#: ../src/Audience.vala:35
155msgid "Watch videos and movies"125msgid "Watch videos and movies"
156msgstr ""126msgstr ""
157127
158#: ../src/Audience.vala:48128#: ../src/Audience.vala:36
159msgid "Video Player"129msgid "Video Player"
160msgstr ""130msgstr ""
161131
162#. / TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is branded "Audience".132#. / TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is branded "Audience".
163#: ../src/Audience.vala:50133#: ../src/Audience.vala:38
164msgid "About Audience"134msgid "About Audience"
165msgstr ""135msgstr ""
166136
167#. / TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".137#. / TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".
168#: ../src/Audience.vala:52138#: ../src/Audience.vala:40
169msgid "About Videos"139msgid "About Videos"
170msgstr ""140msgstr ""
171141
172#: ../src/Audience.vala:53142#: ../src/Audience.vala:69
173msgid "translator-credits"143msgid "about-translators"
174msgstr ""144msgstr ""
175145
176#: ../src/Audience.vala:247146#: ../src/Window.vala:232
147msgid "%u Video added to Playlist"
148msgstr ""
149
150#: ../src/Window.vala:232
151msgid "%u Videos added to Playlist"
152msgstr ""
153
154#: ../src/Window.vala:252
177msgid "Open"155msgid "Open"
178msgstr ""156msgstr ""
179157
180#: ../src/Audience.vala:248158#: ../src/Window.vala:253
181msgid "_Cancel"159msgid "_Cancel"
182msgstr ""160msgstr ""
183161
184#: ../src/Audience.vala:248162#: ../src/Window.vala:253
185msgid "_Open"163msgid "_Open"
186msgstr ""164msgstr ""
187165
188#: ../src/Audience.vala:257166#: ../src/Window.vala:262
189msgid "Video files"167msgid "Video files"
190msgstr ""168msgstr ""
191
192#: ../src/Audience.vala:363
193msgid "Video added to playlist"
194msgstr ""
195
196#: ../src/Audience.vala:365
197msgid "%i videos added to playlist"
198msgstr ""
199169
=== modified file 'src/Audience.vala'
--- src/Audience.vala 2016-03-14 13:10:18 +0000
+++ src/Audience.vala 2016-07-17 00:09:38 +0000
@@ -38,7 +38,6 @@
38 public const string ABOUT_STOCK = N_("About Audience");38 public const string ABOUT_STOCK = N_("About Audience");
39 /// TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".39 /// TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".
40 public const string ABOUT_GENERIC = N_("About Videos");40 public const string ABOUT_GENERIC = N_("About Videos");
41 public const string ABOUT_TRANSLATORS = N_("translator-credits");
4241
43 public Window mainwindow;42 public Window mainwindow;
44 public GLib.VolumeMonitor monitor;43 public GLib.VolumeMonitor monitor;
@@ -53,7 +52,9 @@
53 build_version = Constants.VERSION;52 build_version = Constants.VERSION;
54 build_version_info = Constants.VERSION_INFO;53 build_version_info = Constants.VERSION_INFO;
5554
56 app_years = "2011-2015";55 Intl.setlocale (LocaleCategory.ALL, "");
56
57 app_years = "2011-2016";
57 app_icon = "multimedia-video-player";58 app_icon = "multimedia-video-player";
58 app_launcher = "audience.desktop";59 app_launcher = "audience.desktop";
59 application_id = "net.launchpad.audience";60 application_id = "net.launchpad.audience";
@@ -65,10 +66,7 @@
6566
66 about_authors = { "Cody Garver <cody@elementaryos.org>",67 about_authors = { "Cody Garver <cody@elementaryos.org>",
67 "Tom Beckmann <tom@elementaryos.org>" };68 "Tom Beckmann <tom@elementaryos.org>" };
68 /*about_documenters = {""};69 about_translators = _("about-translators");
69 about_artists = {""};
70 about_translators = Constants.ABOUT_TRANSLATORS;
71 about_comments = "To be determined"; */
72 about_license_type = Gtk.License.GPL_3_0;70 about_license_type = Gtk.License.GPL_3_0;
73 }71 }
7472

Subscribers

People subscribed via source and target branches