Audience

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

  1. translations-gen-fix
  2. Merge into 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.
lp:~gotwig/audience/translations-gen-fix updated
210. By Eduard Gotwig <email address hidden>

make pot :-)

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

Great!

review: Approve
lp:~gotwig/audience/translations-gen-fix updated
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
=== modified file 'Audience/Audience.vala'
--- Audience/Audience.vala 2012-07-27 00:03:13 +0000
+++ Audience/Audience.vala 2012-08-01 21:34:17 +0000
@@ -99,7 +99,7 @@
99 if (settings.last_folder == "-1")99 if (settings.last_folder == "-1")
100 settings.last_folder = Environment.get_home_dir ();100 settings.last_folder = Environment.get_home_dir ();
101 101
102 this.welcome = new Granite.Widgets.Welcome ("No videos are open.", _("Select a source to begin playing."));102 this.welcome = new Granite.Widgets.Welcome (_("No videos are open."), _("Select a source to begin playing."));
103 welcome.append ("document-open", _("Open file"), _("Open a saved file."));103 welcome.append ("document-open", _("Open file"), _("Open a saved file."));
104 104
105 //welcome.append ("internet-web-browser", _("Open a location"), _("Watch something from the infinity of the internet"));105 //welcome.append ("internet-web-browser", _("Open a location"), _("Watch something from the infinity of the internet"));
@@ -109,7 +109,7 @@
109 welcome.append ("media-playback-start", _("Resume last video"), get_title (File.new_for_uri (filename).get_basename ()));109 welcome.append ("media-playback-start", _("Resume last video"), get_title (File.new_for_uri (filename).get_basename ()));
110 }110 }
111 if (has_dvd)111 if (has_dvd)
112 welcome.append ("media-cdrom", _("Play from Dics"), _("Watch a DVD or open a file from dics"));112 welcome.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
113 113
114 /*UI*/114 /*UI*/
115 this.canvas.reactive = true;115 this.canvas.reactive = true;
116116
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt 2012-02-23 16:38:24 +0000
+++ po/CMakeLists.txt 2012-08-01 21:34:17 +0000
@@ -2,4 +2,5 @@
2add_translations_directory (audience)2add_translations_directory (audience)
3add_translations_catalog (audience3add_translations_catalog (audience
4 ../Audience4 ../Audience
5 ../Audience/Widgets
5)6)
67
=== modified file 'po/audience.pot'
--- po/audience.pot 2012-07-26 23:17:03 +0000
+++ po/audience.pot 2012-08-01 21:34:17 +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: 2012-07-27 01:16+0200\n"11"POT-Creation-Date: 2012-08-01 23:30+0200\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,106 +17,138 @@
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#: /home/tom/Programming/audience/po/../Audience/desktop-launcher.vala:520#: /home/gotwig/audience/po/../Audience/Audience.vala:102
21msgid "Play your media"21msgid "No videos are open."
22msgstr ""22msgstr ""
2323
24#: /home/tom/Programming/audience/po/../Audience/desktop-launcher.vala:624#: /home/gotwig/audience/po/../Audience/Audience.vala:102
25msgid "Media Player"
26msgstr ""
27
28#: /home/tom/Programming/audience/po/../Audience/Audience.vala:100
29msgid "Select a source to begin playing."25msgid "Select a source to begin playing."
30msgstr ""26msgstr ""
3127
32#: /home/tom/Programming/audience/po/../Audience/Audience.vala:10128#: /home/gotwig/audience/po/../Audience/Audience.vala:103
33msgid "Open file"29msgid "Open file"
34msgstr ""30msgstr ""
3531
36#: /home/tom/Programming/audience/po/../Audience/Audience.vala:10132#: /home/gotwig/audience/po/../Audience/Audience.vala:103
37msgid "Open a saved file."33msgid "Open a saved file."
38msgstr ""34msgstr ""
3935
40#: /home/tom/Programming/audience/po/../Audience/Audience.vala:10736#: /home/gotwig/audience/po/../Audience/Audience.vala:109
41msgid "Resume last video"37msgid "Resume last video"
42msgstr ""38msgstr ""
4339
44#: /home/tom/Programming/audience/po/../Audience/Audience.vala:11040#: /home/gotwig/audience/po/../Audience/Audience.vala:112
45msgid "Play from Dics"41msgid "Play from Disc"
46msgstr ""42msgstr ""
4743
48#: /home/tom/Programming/audience/po/../Audience/Audience.vala:11044#: /home/gotwig/audience/po/../Audience/Audience.vala:112
49msgid "Watch a DVD or open a file from dics"45msgid "Watch a DVD or open a file from disc"
50msgstr ""46msgstr ""
5147
52#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13348#: /home/gotwig/audience/po/../Audience/Audience.vala:135
53msgid "Play"49msgid "Play"
54msgstr ""50msgstr ""
5551
56#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13452#: /home/gotwig/audience/po/../Audience/Audience.vala:136
57#: /home/tom/Programming/audience/po/../Audience/Audience.vala:65053#: /home/gotwig/audience/po/../Audience/Audience.vala:657
58msgid "Open"54msgid "Open"
59msgstr ""55msgstr ""
6056
61#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13557#: /home/gotwig/audience/po/../Audience/Audience.vala:137
62msgid "Sidebar"58msgid "Sidebar"
63msgstr ""59msgstr ""
6460
65#: /home/tom/Programming/audience/po/../Audience/Audience.vala:13661#: /home/gotwig/audience/po/../Audience/Audience.vala:138
66msgid "Leave Fullscreen"62msgid "Leave Fullscreen"
67msgstr ""63msgstr ""
6864
69#: /home/tom/Programming/audience/po/../Audience/Audience.vala:19565#: /home/gotwig/audience/po/../Audience/Audience.vala:198
70msgid "Open location"66msgid "Open location"
71msgstr ""67msgstr ""
7268
73#: /home/tom/Programming/audience/po/../Audience/Audience.vala:20469#: /home/gotwig/audience/po/../Audience/Audience.vala:207
74msgid "Choose location"70msgid "Choose location"
75msgstr ""71msgstr ""
7672
77#: /home/tom/Programming/audience/po/../Audience/Audience.vala:24573#: /home/gotwig/audience/po/../Audience/Audience.vala:248
78msgid "Error"74msgid "Error"
79msgstr ""75msgstr ""
8076
81#: /home/tom/Programming/audience/po/../Audience/Audience.vala:25577#: /home/gotwig/audience/po/../Audience/Audience.vala:258
82msgid "Oops! Audience can't play this file!"78msgid "Oops! Audience can't play this file!"
83msgstr ""79msgstr ""
8480
85#: /home/tom/Programming/audience/po/../Audience/Audience.vala:28281#: /home/gotwig/audience/po/../Audience/Audience.vala:285
86msgid ""82msgid ""
87"Some media files need extra software to be played. Audience can install this "83"Some media files need extra software to be played. Audience can install this "
88"software automatically."84"software automatically."
89msgstr ""85msgstr ""
9086
91#: /home/tom/Programming/audience/po/../Audience/Audience.vala:28887#: /home/gotwig/audience/po/../Audience/Audience.vala:291
92#, c-format88#, c-format
93msgid "Audience needs %s to play this file."89msgid "Audience needs %s to play this file."
94msgstr ""90msgstr ""
9591
96#: /home/tom/Programming/audience/po/../Audience/Audience.vala:29192#: /home/gotwig/audience/po/../Audience/Audience.vala:294
97msgid "Don't install"93msgid "Don't install"
98msgstr ""94msgstr ""
9995
100#: /home/tom/Programming/audience/po/../Audience/Audience.vala:29296#: /home/gotwig/audience/po/../Audience/Audience.vala:295
101msgid "Install"97msgid "Install"
102msgstr ""98msgstr ""
10399
104#: /home/tom/Programming/audience/po/../Audience/Audience.vala:468100#: /home/gotwig/audience/po/../Audience/Audience.vala:471
105msgid "Add from Harddrive"101msgid "Add from Harddrive"
106msgstr ""102msgstr ""
107103
108#: /home/tom/Programming/audience/po/../Audience/Audience.vala:470104#: /home/gotwig/audience/po/../Audience/Audience.vala:473
109msgid "Play a DVD"105msgid "Play a DVD"
110msgstr ""106msgstr ""
111107
112#: /home/tom/Programming/audience/po/../Audience/Audience.vala:472108#: /home/gotwig/audience/po/../Audience/Audience.vala:475
113msgid "Network File"109msgid "Network File"
114msgstr ""110msgstr ""
115111
116#: /home/tom/Programming/audience/po/../Audience/Audience.vala:656112#: /home/gotwig/audience/po/../Audience/Audience.vala:663
117msgid "All files"113msgid "All files"
118msgstr ""114msgstr ""
119115
120#: /home/tom/Programming/audience/po/../Audience/Audience.vala:660116#: /home/gotwig/audience/po/../Audience/Audience.vala:667
121msgid "Video files"117msgid "Video files"
122msgstr ""118msgstr ""
119
120#: /home/gotwig/audience/po/../Audience/desktop-launcher.vala:5
121msgid "Play your media"
122msgstr ""
123
124#: /home/gotwig/audience/po/../Audience/desktop-launcher.vala:6
125msgid "Media Player"
126msgstr ""
127
128#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:54
129msgid "Language"
130msgstr ""
131
132#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:55
133msgid "Subtitles"
134msgstr ""
135
136#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:94
137msgid "Playlist"
138msgstr ""
139
140#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:95
141msgid "Options"
142msgstr ""
143
144#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:97
145msgid "Details"
146msgstr ""
147
148#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:218
149msgid "Default"
150msgstr ""
151
152#: /home/gotwig/audience/po/../Audience/Widgets/TagView.vala:231
153msgid "None"
154msgstr ""

Subscribers

People subscribed via source and target branches