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

[Leonardo Lemos]

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

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

=== 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 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-03 15:10-0200\n"
+"POT-Creation-Date: 2016-07-17 04:08+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,7 +17,59 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/Widgets/SettingsPopover.vala:35 ../src/Audience.vala:253
+#: ../src/Widgets/BottomBar.vala:52 ../src/Widgets/BottomBar.vala:106
+msgid "Play"
+msgstr ""
+
+#: ../src/Widgets/BottomBar.vala:56
+msgid "Playlist"
+msgstr ""
+
+#: ../src/Widgets/BottomBar.vala:60
+msgid "Settings"
+msgstr ""
+
+#: ../src/Widgets/BottomBar.vala:102
+msgid "Pause"
+msgstr ""
+
+#: ../src/Widgets/BottomBar.vala:127
+msgid "Unfullscreen"
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:5
+msgid "No Videos Open"
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:5
+msgid "Select a source to begin playing."
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:9 ../src/Widgets/PlaylistPopover.vala:35
+msgid "Open file"
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:9
+msgid "Open a saved file."
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:19
+msgid "Replay last video"
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:21
+msgid "Resume last video"
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:36 ../src/Widgets/PlaylistPopover.vala:37
+msgid "Play from Disc"
+msgstr ""
+
+#: ../src/Widgets/WelcomePage.vala:36
+msgid "Watch a DVD or open a file from disc"
+msgstr ""
+
+#: ../src/Widgets/SettingsPopover.vala:35 ../src/Window.vala:258
 msgid "All files"
 msgstr ""
 
@@ -42,157 +94,75 @@
 msgid "External Subtitles:"
 msgstr ""
 
+#: ../src/Widgets/SettingsPopover.vala:108
+msgid "None"
+msgstr ""
+
 #: ../src/Widgets/SettingsPopover.vala:123
-msgid "None"
-msgstr ""
-
-#: ../src/Widgets/SettingsPopover.vala:154
 msgid "Default"
 msgstr ""
 
-#: ../src/Widgets/PlaylistPopover.vala:35 ../src/Widgets/WelcomePage.vala:5
-msgid "Open file"
-msgstr ""
-
-#: ../src/Widgets/PlaylistPopover.vala:37 ../src/Widgets/WelcomePage.vala:23
-msgid "Play from Disc"
-msgstr ""
-
-#: ../src/Widgets/PlaylistPopover.vala:43
-#: ../src/Widgets/PlaylistPopover.vala:70
+#: ../src/Widgets/PlaylistPopover.vala:41
+#: ../src/Widgets/PlaylistPopover.vala:67
 msgid "Enable Repeat"
 msgstr ""
 
-#: ../src/Widgets/PlaylistPopover.vala:67
+#: ../src/Widgets/PlaylistPopover.vala:64
 msgid "Disable Repeat"
 msgstr ""
 
-#: ../src/Widgets/BottomBar.vala:55 ../src/Widgets/BottomBar.vala:134
-msgid "Play"
-msgstr ""
-
-#: ../src/Widgets/BottomBar.vala:59
-msgid "Playlist"
-msgstr ""
-
-#: ../src/Widgets/BottomBar.vala:63
-msgid "Settings"
-msgstr ""
-
-#: ../src/Widgets/BottomBar.vala:119
-msgid "Unfullscreen"
-msgstr ""
-
-#: ../src/Widgets/BottomBar.vala:130
-msgid "Pause"
-msgstr ""
-
-#: ../src/Widgets/VideoPlayer.vala:378
-msgid "Error"
-msgstr ""
-
-#: ../src/Widgets/VideoPlayer.vala:378
-msgid "_OK"
-msgstr ""
-
-#: ../src/Widgets/VideoPlayer.vala:384
-msgid "Oops! Audience can't play this file!"
-msgstr ""
-
-#: ../src/Widgets/VideoPlayer.vala:404
-msgid ""
-"Some media files need extra software to be played. Audience can install this "
-"software automatically."
-msgstr ""
-
-#: ../src/Widgets/VideoPlayer.vala:409
-msgid "Audience needs %s to play this file."
-msgstr ""
-
-#: ../src/Widgets/VideoPlayer.vala:416
-msgid "Don't install"
-msgstr ""
-
-#: ../src/Widgets/VideoPlayer.vala:417
-msgid "Install"
-msgstr ""
-
-#: ../src/Widgets/WelcomePage.vala:4
-msgid "No Videos Open"
-msgstr ""
-
-#: ../src/Widgets/WelcomePage.vala:4
-msgid "Select a source to begin playing."
-msgstr ""
-
-#: ../src/Widgets/WelcomePage.vala:5
-msgid "Open a saved file."
-msgstr ""
-
-#: ../src/Widgets/WelcomePage.vala:17
-msgid "Replay last video"
-msgstr ""
-
-#: ../src/Widgets/WelcomePage.vala:19
-msgid "Resume last video"
-msgstr ""
-
-#: ../src/Widgets/WelcomePage.vala:23
-msgid "Watch a DVD or open a file from disc"
-msgstr ""
-
 #. / 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".
-#: ../src/Audience.vala:44
+#: ../src/Audience.vala:32
 msgid "Videos"
 msgstr ""
 
 #. / TRANSLATORS: These are the keywords used when searching for this application in an application store or launcher.
-#: ../src/Audience.vala:46
+#: ../src/Audience.vala:34
 msgid "Audience;Video;Player;Movies;"
 msgstr ""
 
-#: ../src/Audience.vala:47
+#: ../src/Audience.vala:35
 msgid "Watch videos and movies"
 msgstr ""
 
-#: ../src/Audience.vala:48
+#: ../src/Audience.vala:36
 msgid "Video Player"
 msgstr ""
 
 #. / TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is branded "Audience".
-#: ../src/Audience.vala:50
+#: ../src/Audience.vala:38
 msgid "About Audience"
 msgstr ""
 
 #. / TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".
-#: ../src/Audience.vala:52
+#: ../src/Audience.vala:40
 msgid "About Videos"
 msgstr ""
 
-#: ../src/Audience.vala:53
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/Audience.vala:247
+#: ../src/Audience.vala:69
+msgid "about-translators"
+msgstr ""
+
+#: ../src/Window.vala:232
+msgid "%u Video added to Playlist"
+msgstr ""
+
+#: ../src/Window.vala:232
+msgid "%u Videos added to Playlist"
+msgstr ""
+
+#: ../src/Window.vala:252
 msgid "Open"
 msgstr ""
 
-#: ../src/Audience.vala:248
+#: ../src/Window.vala:253
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/Audience.vala:248
+#: ../src/Window.vala:253
 msgid "_Open"
 msgstr ""
 
-#: ../src/Audience.vala:257
+#: ../src/Window.vala:262
 msgid "Video files"
 msgstr ""
-
-#: ../src/Audience.vala:363
-msgid "Video added to playlist"
-msgstr ""
-
-#: ../src/Audience.vala:365
-msgid "%i videos added to playlist"
-msgstr ""

=== 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 @@
         public const string ABOUT_STOCK = N_("About Audience");
         /// TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".
         public const string ABOUT_GENERIC = N_("About Videos");
-        public const string ABOUT_TRANSLATORS = N_("translator-credits");
 
         public Window mainwindow;
         public GLib.VolumeMonitor monitor;
@@ -53,7 +52,9 @@
             build_version = Constants.VERSION;
             build_version_info = Constants.VERSION_INFO;
 
-            app_years = "2011-2015";
+            Intl.setlocale (LocaleCategory.ALL, "");
+
+            app_years = "2011-2016";
             app_icon = "multimedia-video-player";
             app_launcher = "audience.desktop";
             application_id = "net.launchpad.audience";
@@ -65,10 +66,7 @@
 
             about_authors = { "Cody Garver <[e-mail]>",
                               "Tom Beckmann <[e-mail]>" };
-            /*about_documenters = {""};
-            about_artists = {""};
-            about_translators = Constants.ABOUT_TRANSLATORS;
-            about_comments = "To be determined"; */
+            about_translators = _("about-translators");
             about_license_type = Gtk.License.GPL_3_0;
         }