Ubiquity Slideshow

Merge lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu-mate-xenial into lp:ubiquity-slideshow-ubuntu

  1. ubiquity-slideshow-ubuntu-mate-xenial
  2. Merge into html
Proposed by Martin Wimpress on 2016-01-10
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2016-01-18
Approved revision: 724
Merged at revision: 727
Proposed branch: lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu-mate-xenial
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 414 lines (+93/-143)
10 files modified
slideshows/oem-config-ubuntu-mate/slides/index.html (+0/-51)
slideshows/ubuntu-mate/slides/02_about.html (+1/-1)
slideshows/ubuntu-mate/slides/03_usc.html (+0/-35)
slideshows/ubuntu-mate/slides/03_welcome.html (+39/-0)
slideshows/ubuntu-mate/slides/04_music.html (+11/-0)
slideshows/ubuntu-mate/slides/05_photos.html (+2/-2)
slideshows/ubuntu-mate/slides/06_browse.html (+3/-4)
slideshows/ubuntu-mate/slides/08_accessibility.html (+1/-1)
slideshows/ubuntu-mate/slides/09_community.html (+17/-17)
slideshows/ubuntu-mate/slides/index.html (+19/-32)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu-mate-xenial
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2016-01-10 Pending
Ubiquity Slideshow 2016-01-10 Pending
Review via email: mp+282117@code.launchpad.net

Description of the Change

This merge proposal updates the Ubiquity slideshows for Ubuntu MATE 16.04. Some wording have been changed and new screenshots created.

To post a comment you must log in.
Martin Wimpress (flexiondotorg) wrote :

Any chance this might be merged in time for 16.04 Beta 1 please?

Martin Wimpress (flexiondotorg) wrote :

Would be great to have this merged so I can request that translators do their thing :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed symlink 'slideshows/oem-config-ubuntu-mate/slides/03_usc.html'
2=== target was u'../../ubuntu-mate/slides/03_usc.html'
3=== added symlink 'slideshows/oem-config-ubuntu-mate/slides/03_welcome.html'
4=== target is u'../../ubuntu-mate/slides/03_welcome.html'
5=== modified file 'slideshows/oem-config-ubuntu-mate/slides/index.html'
6--- slideshows/oem-config-ubuntu-mate/slides/index.html 2015-03-21 21:35:45 +0000
7+++ slideshows/oem-config-ubuntu-mate/slides/index.html 1970-01-01 00:00:00 +0000
8@@ -1,51 +0,0 @@
9-<!DOCTYPE html>
10-
11-<html lang="en">
12-
13-<head>
14- <title>ubiquity-slideshow-ubuntu-mate</title>
15-
16- <link href="link/base.css" rel="stylesheet" type="text/css" />
17-
18- <base target="_blank" />
19-
20- <script type="text/javascript" src="link-core/jquery.js"></script>
21- <script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
22-
23- <script type="text/javascript" src="link-core/base.js"></script>
24-
25- <script type="text/javascript">
26- SLIDESHOW_OPTIONS = {
27- timeout:50000,
28- speed:600,
29- }
30- </script>
31-
32- <script type="text/javascript" src="link-core/slideshow.js"></script>
33-</head>
34-
35-<body>
36-
37-<div id="wrapper">
38- <div id="slideshow">
39- <div><a href="01_welcome.html"></a></div>
40- <div><a href="02_about.html"></a></div>
41- <div><a href="03_usc.html"></a></div>
42- <div><a href="04_music.html"></a></div>
43- <div><a href="05_photos.html"></a></div>
44- <div><a href="06_browse.html"></a></div>
45- <div><a href="07_office.html"></a></div>
46- <div><a href="08_accessibility.html"></a></div>
47- <div><a href="09_community.html"></a></div>
48- </div>
49-
50- <div id="controls">
51- <a class="control-arrow" id="prev-slide" style="display:none;"></a>
52- <a class="control-arrow" id="next-slide"></a>
53- <input type="hidden" id="current-slide" />
54- </div>
55-</div>
56-
57-</body>
58-
59-</html>
60
61=== target is u'../../ubuntu-mate/slides/index.html'
62=== modified symlink 'slideshows/oem-config-ubuntu-mate/slides/link-core'
63=== target changed u'../../link-core/' => u'../../link-core'
64=== removed symlink 'slideshows/oem-config-ubuntu-mate/slides/screenshots/03_usc.png'
65=== target was u'../../../ubuntu-mate/slides/screenshots/03_usc.png'
66=== added symlink 'slideshows/oem-config-ubuntu-mate/slides/screenshots/03_welcome.png'
67=== target is u'../../../ubuntu-mate/slides/screenshots/03_welcome.png'
68=== added symlink 'slideshows/oem-config-ubuntu-mate/slides/screenshots/09_community.png'
69=== target is u'../../../ubuntu-mate/slides/screenshots/09_community.png'
70=== modified file 'slideshows/ubuntu-mate/slides/02_about.html'
71--- slideshows/ubuntu-mate/slides/02_about.html 2015-05-18 09:47:49 +0000
72+++ slideshows/ubuntu-mate/slides/02_about.html 2016-01-10 15:22:11 +0000
73@@ -5,7 +5,7 @@
74 <div class="text">
75
76 <div>
77-<p>Ubuntu MATE is a stable, easy-to-use operating system with a configurable desktop environment. Ideal for those who want the most out of their computers and prefer a traditional desktop metaphor. With modest hardware requirements it is suitable for modern desktops and laptops, micro computers and older hardware alike.</p>
78+<p>Ubuntu MATE is a stable, easy-to-use operating system with a configurable desktop environment. Ideal for those who want the most out of their computers and prefer a traditional desktop metaphor. With modest hardware requirements it is suitable for modern workstations, single board computers and older hardware alike.</p>
79 </div>
80
81 </div>
82
83=== removed file 'slideshows/ubuntu-mate/slides/03_usc.html'
84--- slideshows/ubuntu-mate/slides/03_usc.html 2015-08-27 11:02:40 +0000
85+++ slideshows/ubuntu-mate/slides/03_usc.html 1970-01-01 00:00:00 +0000
86@@ -1,35 +0,0 @@
87-<div class="header"><h1 class="slidetitle">Find even more software</h1></div>
88-
89-<div class="main">
90-
91- <div class="text">
92- <div>
93- <p>Say goodbye to searching the web for new software. With Ubuntu MATE Welcome, you can find and install new apps with ease. If you want to discover more applications then use one of the supported software centres to search for what you're looking for, or explore categories such as Science, Education and Games, alongside helpful reviews from other users.</p>
94- </div>
95-
96- <div class="featured">
97- <h2 class="subtitle">Included software</h2>
98- <ul>
99- <li>
100- <img class="icon" src="icons/gdebi.png"/>
101- <p class="caption">GDebi Package Installer</p>
102- </li>
103- </ul>
104- <h2 class="subtitle">Supported software</h2>
105- <ul>
106- <li>
107- <img class="icon" src="icons/softwarecenter.png"/>
108- <p class="caption">Ubuntu Software Center</p>
109- </li>
110- <li>
111- <img class="icon" src="icons/system-software-install.png"/>
112- <p class="caption">Synaptic Package Manager</p>
113- </li>
114- </ul>
115- </div>
116-
117-</div>
118-
119-<img class="screenshot" src="screenshots/03_usc.png" />
120-
121-</div>
122
123=== added file 'slideshows/ubuntu-mate/slides/03_welcome.html'
124--- slideshows/ubuntu-mate/slides/03_welcome.html 1970-01-01 00:00:00 +0000
125+++ slideshows/ubuntu-mate/slides/03_welcome.html 2016-01-10 15:22:11 +0000
126@@ -0,0 +1,39 @@
127+<div class="header"><h1 class="slidetitle">Find even more software</h1></div>
128+
129+<div class="main">
130+
131+ <div class="text">
132+ <div>
133+ <p>Say goodbye to searching the web for new software. With Ubuntu MATE Welcome, you can install popular applications with one click. You can also install software centres to discover even more applications for Ubuntu MATE.</p>
134+ </div>
135+
136+ <div class="featured">
137+ <h2 class="subtitle">Included software</h2>
138+ <ul>
139+ <li>
140+ <img class="icon" src="icons/welcome.png"/>
141+ <p class="caption">Ubuntu MATE Welcome</p>
142+ </li>
143+ </ul>
144+ <h2 class="subtitle">Supported software</h2>
145+ <ul>
146+ <li>
147+ <img class="icon" src="icons/softwarecenter.png"/>
148+ <p class="caption">Ubuntu Software Center</p>
149+ </li>
150+ <li>
151+ <img class="icon" src="icons/system-software-install.png"/>
152+ <p class="caption">Synaptic Package Manager</p>
153+ </li>
154+ <li>
155+ <img class="icon" src="icons/gdebi.png"/>
156+ <p class="caption">GDebi Package Installer</p>
157+ </li>
158+ </ul>
159+ </div>
160+
161+</div>
162+
163+<img class="screenshot" src="screenshots/03_welcome.png" />
164+
165+</div>
166
167=== modified file 'slideshows/ubuntu-mate/slides/04_music.html'
168--- slideshows/ubuntu-mate/slides/04_music.html 2015-04-01 00:01:34 +0000
169+++ slideshows/ubuntu-mate/slides/04_music.html 2016-01-10 15:22:11 +0000
170@@ -15,6 +15,17 @@
171 <p class="caption">Rhythmbox Music Player</p>
172 </li>
173 </ul>
174+ <h2 class="subtitle">Supported software</h2>
175+ <ul>
176+ <li>
177+ <img class="icon" src="icons/banshee.png" />
178+ <p class="caption">Banshee Media Player</p>
179+ </li>
180+ <li>
181+ <img class="icon" src="icons/vlc.png" />
182+ <p class="caption">VLC Media Player</p>
183+ </li>
184+ </ul>
185 </div>
186 </div>
187
188
189=== modified file 'slideshows/ubuntu-mate/slides/05_photos.html'
190--- slideshows/ubuntu-mate/slides/05_photos.html 2015-04-01 00:01:34 +0000
191+++ slideshows/ubuntu-mate/slides/05_photos.html 2016-01-10 15:22:11 +0000
192@@ -1,11 +1,11 @@
193-<div class="header"><h1 class="slidetitle">Have fun with your photos</h1></div>
194+<div class="header"><h1 class="slidetitle">Organise your photos</h1></div>
195
196 <div class="main">
197
198 <div class="text">
199
200 <div>
201-<p>Shotwell is a handy photo manager that is ready for your gadgets. Connect a camera or a phone to transfer your photos, then it's easy to share them and keep them safe. If you're feeling creative, you can try lots of photo apps from the Ubuntu Software Center.</p>
202+<p>Shotwell is a handy photo manager that is ready for your gadgets. Connect a camera or a phone to transfer your photos, then it's easy to share them and keep them safe.</p>
203 </div>
204
205 <div class="featured">
206
207=== modified file 'slideshows/ubuntu-mate/slides/06_browse.html'
208--- slideshows/ubuntu-mate/slides/06_browse.html 2015-04-01 00:01:34 +0000
209+++ slideshows/ubuntu-mate/slides/06_browse.html 2016-01-10 15:22:11 +0000
210@@ -5,7 +5,7 @@
211 <div class="text">
212
213 <div>
214-<p>Ubuntu MATE includes Firefox, the web browser used by millions of people around the world. And web applications you use frequently (like Facebook or Gmail, for example) can be pinned to your desktop for faster access, just like apps on your computer.</p>
215+<p>Ubuntu MATE includes Firefox, an easy and safe web browser used by millions of people around the world. Designed with privacy in mind it includes enhanced security features to protect you from online threats.</p>
216 </div>
217
218 <div class="featured">
219@@ -13,12 +13,11 @@
220 <ul>
221 <li>
222 <img class="icon" src="icons/firefox.png" />
223- <p class="caption">Firefox web browser</p>
224+ <p class="caption">Firefox Web Browser</p>
225 </li>
226 <li>
227 <img class="icon" src="icons/thunderbird.png" />
228- <p class="caption">Thunderbird Mail
229-</p>
230+ <p class="caption">Thunderbird Mail</p>
231 </li>
232 </ul>
233 <h2 class="subtitle">Supported software</h2>
234
235=== modified file 'slideshows/ubuntu-mate/slides/08_accessibility.html'
236--- slideshows/ubuntu-mate/slides/08_accessibility.html 2015-04-01 00:01:34 +0000
237+++ slideshows/ubuntu-mate/slides/08_accessibility.html 2016-01-10 15:22:11 +0000
238@@ -1,4 +1,4 @@
239-<div class="header"><h1 class="slidetitle">Access for everyone</h1></div>
240+<div class="header"><h1 class="slidetitle">Accessible for everyone</h1></div>
241
242 <div class="main">
243
244
245=== modified file 'slideshows/ubuntu-mate/slides/09_community.html'
246--- slideshows/ubuntu-mate/slides/09_community.html 2015-05-18 09:47:49 +0000
247+++ slideshows/ubuntu-mate/slides/09_community.html 2016-01-10 15:22:11 +0000
248@@ -1,33 +1,29 @@
249-<div class="header"><h1 class="slidetitle">Community</h1></div>
250+<div class="header"><h1 class="slidetitle">Join the community</h1></div>
251
252 <div class="main">
253
254 <div class="text">
255
256-<div>
257-<p>We have a number of ways you can connect with the Ubuntu MATE community.</p>
258-</div>
259-
260 <div class="featured">
261 <h2 class="subtitle">Discussion</h2>
262 <ul>
263 <li>
264 <img class="icon2" src="link/bullet-point.png" />
265- <a href="https://ubuntu-mate.community" class="caption">Ubuntu MATE Forum</a>
266- </li>
267- <li>
268- <img class="icon2" src="link/bullet-point.png" />
269- <a href="https://ubuntu-mate.org/irc/" class="caption">Ubuntu MATE IRC channel</a>
270+ <a href="https://ubuntu-mate.community" class="caption">Ubuntu MATE Community</a>
271+ </li>
272+ <li>
273+ <img class="icon2" src="link/bullet-point.png" />
274+ <a href="https://plus.google.com/communities/108331279007926658904" class="caption">Google+ Community</a>
275+ </li>
276+ <li>
277+ <img class="icon2" src="link/bullet-point.png" />
278+ <a href="https://ubuntu-mate.org/irc/" class="caption">IRC Channel</a>
279 </li>
280 </ul>
281-<h2 class="subtitle">Social Networks</h2>
282+<h2 class="subtitle">Announcements</h2>
283 <ul>
284 <li>
285 <img class="icon2" src="link/bullet-point.png" />
286- <a href="https://plus.google.com/communities/108331279007926658904" class="caption">Google+</a>
287- </li>
288- <li>
289- <img class="icon2" src="link/bullet-point.png" />
290 <a href="https://twitter.com/ubuntu_mate" class="caption">Twitter</a>
291 </li>
292 <li>
293@@ -39,13 +35,17 @@
294 <ul>
295 <li>
296 <img class="icon2" src="link/bullet-point.png" />
297- <a href="https://launchpad.net/ubuntu-mate" class="caption">Ubuntu MATE Project</a>
298+ <a href="https://launchpad.net/ubuntu-mate" class="caption">Ubuntu MATE Launchpad</a>
299+ </li>
300+ <li>
301+ <img class="icon2" src="link/bullet-point.png" />
302+ <a href="https://bugs.launchpad.net/ubuntu-mate" class="caption">Bug Tracker</a>
303 </li>
304 </ul>
305 </div>
306
307 </div>
308
309-<img class="screenshot" src="screenshots/02_about.png" />
310+<img class="screenshot" src="screenshots/09_community.png" />
311
312 </div>
313
314=== added file 'slideshows/ubuntu-mate/slides/icons/banshee.png'
315Binary files slideshows/ubuntu-mate/slides/icons/banshee.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/icons/banshee.png 2016-01-10 15:22:11 +0000 differ
316=== modified file 'slideshows/ubuntu-mate/slides/icons/firefox.png'
317Binary files slideshows/ubuntu-mate/slides/icons/firefox.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/icons/firefox.png 2016-01-10 15:22:11 +0000 differ
318=== added file 'slideshows/ubuntu-mate/slides/icons/vlc.png'
319Binary files slideshows/ubuntu-mate/slides/icons/vlc.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/icons/vlc.png 2016-01-10 15:22:11 +0000 differ
320=== added file 'slideshows/ubuntu-mate/slides/icons/welcome.png'
321Binary files slideshows/ubuntu-mate/slides/icons/welcome.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/icons/welcome.png 2016-01-10 15:22:11 +0000 differ
322=== modified file 'slideshows/ubuntu-mate/slides/index.html'
323--- slideshows/ubuntu-mate/slides/index.html 2015-04-01 12:05:58 +0000
324+++ slideshows/ubuntu-mate/slides/index.html 2016-01-10 15:22:11 +0000
325@@ -1,51 +1,38 @@
326 <!DOCTYPE html>
327-
328 <html lang="en">
329-
330 <head>
331- <title>ubiquity-slideshow-ubuntu-mate</title>
332-
333+ <title>ubiquity-slideshow-ubuntu-mate</title>
334 <link href="link/base.css" rel="stylesheet" type="text/css" />
335-
336 <base target="_blank" />
337-
338 <script type="text/javascript" src="link-core/jquery.js"></script>
339 <script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
340-
341 <script type="text/javascript" src="link-core/base.js"></script>
342-
343 <script type="text/javascript">
344 SLIDESHOW_OPTIONS = {
345 timeout:50000,
346 speed:600,
347 }
348 </script>
349-
350 <script type="text/javascript" src="link-core/slideshow.js"></script>
351 </head>
352-
353 <body>
354-
355-<div id="wrapper">
356- <div id="slideshow">
357- <div><a href="01_welcome.html"></a></div>
358- <div><a href="02_about.html"></a></div>
359- <div><a href="03_usc.html"></a></div>
360- <div><a href="04_music.html"></a></div>
361- <div><a href="05_photos.html"></a></div>
362- <div><a href="06_browse.html"></a></div>
363- <div><a href="07_office.html"></a></div>
364- <div><a href="08_accessibility.html"></a></div>
365- <div><a href="09_community.html"></a></div>
366- </div>
367-
368- <div id="controls">
369- <a class="control-arrow" id="prev-slide" style="display:none;"></a>
370- <a class="control-arrow" id="next-slide"></a>
371- <input type="hidden" id="current-slide" />
372- </div>
373-</div>
374-
375+ <div id="wrapper">
376+ <div id="slideshow">
377+ <div><a href="01_welcome.html"></a></div>
378+ <div><a href="02_about.html"></a></div>
379+ <div><a href="03_welcome.html"></a></div>
380+ <div><a href="04_music.html"></a></div>
381+ <div><a href="05_photos.html"></a></div>
382+ <div><a href="06_browse.html"></a></div>
383+ <div><a href="07_office.html"></a></div>
384+ <div><a href="08_accessibility.html"></a></div>
385+ <div><a href="09_community.html"></a></div>
386+ </div>
387+ <div id="controls">
388+ <a class="control-arrow" id="prev-slide" style="display:none;"></a>
389+ <a class="control-arrow" id="next-slide"></a>
390+ <input type="hidden" id="current-slide" />
391+ </div>
392+ </div>
393 </body>
394-
395 </html>
396
397=== modified file 'slideshows/ubuntu-mate/slides/screenshots/02_about.png'
398Binary files slideshows/ubuntu-mate/slides/screenshots/02_about.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/02_about.png 2016-01-10 15:22:11 +0000 differ
399=== removed file 'slideshows/ubuntu-mate/slides/screenshots/03_usc.png'
400Binary files slideshows/ubuntu-mate/slides/screenshots/03_usc.png 2015-08-27 11:02:40 +0000 and slideshows/ubuntu-mate/slides/screenshots/03_usc.png 1970-01-01 00:00:00 +0000 differ
401=== added file 'slideshows/ubuntu-mate/slides/screenshots/03_welcome.png'
402Binary files slideshows/ubuntu-mate/slides/screenshots/03_welcome.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/screenshots/03_welcome.png 2016-01-10 15:22:11 +0000 differ
403=== modified file 'slideshows/ubuntu-mate/slides/screenshots/04_music.png'
404Binary files slideshows/ubuntu-mate/slides/screenshots/04_music.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/04_music.png 2016-01-10 15:22:11 +0000 differ
405=== modified file 'slideshows/ubuntu-mate/slides/screenshots/05_photos.png'
406Binary files slideshows/ubuntu-mate/slides/screenshots/05_photos.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/05_photos.png 2016-01-10 15:22:11 +0000 differ
407=== modified file 'slideshows/ubuntu-mate/slides/screenshots/06_browse.png'
408Binary files slideshows/ubuntu-mate/slides/screenshots/06_browse.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/06_browse.png 2016-01-10 15:22:11 +0000 differ
409=== modified file 'slideshows/ubuntu-mate/slides/screenshots/07_office.png'
410Binary files slideshows/ubuntu-mate/slides/screenshots/07_office.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/07_office.png 2016-01-10 15:22:11 +0000 differ
411=== modified file 'slideshows/ubuntu-mate/slides/screenshots/08_customize.png'
412Binary files slideshows/ubuntu-mate/slides/screenshots/08_customize.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/08_customize.png 2016-01-10 15:22:11 +0000 differ
413=== added file 'slideshows/ubuntu-mate/slides/screenshots/09_community.png'
414Binary files slideshows/ubuntu-mate/slides/screenshots/09_community.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/screenshots/09_community.png 2016-01-10 15:22:11 +0000 differ

Subscribers

People subscribed via source and target branches