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

Proposed by Eduard Gotwig
Status: Merged
Merged at revision: 210
Proposed branch: lp:~gotwig/audience/translations-gen-fix
Merge into: lp:~audience-members/audience/trunk
Diff against target: 39 lines (+4/-4)
2 files modified
Audience/Audience.vala (+1/-1)
po/audience.pot (+3/-3)
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+117809@code.launchpad.net

This proposal supersedes 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.
Revision history for this message
Cody Garver (codygarver) wrote : Posted in a previous version of this proposal

Great!

review: Approve
Revision history for this message
Cody Garver (codygarver) :
review: Approve

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-08-01 20:56:45 +0000
3+++ Audience/Audience.vala 2012-08-01 21:57:20 +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
14=== modified file 'po/audience.pot'
15--- po/audience.pot 2012-08-01 21:31:22 +0000
16+++ po/audience.pot 2012-08-01 21:57:20 +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-01 23:30+0200\n"
22+"POT-Creation-Date: 2012-08-01 23:51+0200\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@@ -18,11 +18,11 @@
27 "Content-Transfer-Encoding: 8bit\n"
28
29 #: /home/gotwig/audience/po/../Audience/Audience.vala:102
30-msgid "No videos are open."
31+msgid "No videos are open"
32 msgstr ""
33
34 #: /home/gotwig/audience/po/../Audience/Audience.vala:102
35-msgid "Select a source to begin playing."
36+msgid "Select a source to begin playing"
37 msgstr ""
38
39 #: /home/gotwig/audience/po/../Audience/Audience.vala:103

Subscribers

People subscribed via source and target branches