ubiquity-slideshow team mailing list archive
-
ubiquity-slideshow team
-
Mailing list archive
-
Message #02515
[Merge] lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu-mate-xenial into lp:ubiquity-slideshow-ubuntu
Martin Wimpress has proposed merging lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu-mate-xenial into lp:ubiquity-slideshow-ubuntu.
Requested reviews:
Ubiquity Slideshow (ubiquity-slideshow)
For more details, see:
https://code.launchpad.net/~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu-mate-xenial/+merge/282117
This merge proposal updates the Ubiquity slideshows for Ubuntu MATE 16.04. Some wording have been changed and new screenshots created.
--
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu-mate-xenial into lp:ubiquity-slideshow-ubuntu.
=== removed symlink 'slideshows/oem-config-ubuntu-mate/slides/03_usc.html'
=== target was u'../../ubuntu-mate/slides/03_usc.html'
=== added symlink 'slideshows/oem-config-ubuntu-mate/slides/03_welcome.html'
=== target is u'../../ubuntu-mate/slides/03_welcome.html'
=== modified file 'slideshows/oem-config-ubuntu-mate/slides/index.html'
--- slideshows/oem-config-ubuntu-mate/slides/index.html 2015-03-21 21:35:45 +0000
+++ slideshows/oem-config-ubuntu-mate/slides/index.html 1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-
-<head>
- <title>ubiquity-slideshow-ubuntu-mate</title>
-
- <link href="link/base.css" rel="stylesheet" type="text/css" />
-
- <base target="_blank" />
-
- <script type="text/javascript" src="link-core/jquery.js"></script>
- <script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
-
- <script type="text/javascript" src="link-core/base.js"></script>
-
- <script type="text/javascript">
- SLIDESHOW_OPTIONS = {
- timeout:50000,
- speed:600,
- }
- </script>
-
- <script type="text/javascript" src="link-core/slideshow.js"></script>
-</head>
-
-<body>
-
-<div id="wrapper">
- <div id="slideshow">
- <div><a href="01_welcome.html"></a></div>
- <div><a href="02_about.html"></a></div>
- <div><a href="03_usc.html"></a></div>
- <div><a href="04_music.html"></a></div>
- <div><a href="05_photos.html"></a></div>
- <div><a href="06_browse.html"></a></div>
- <div><a href="07_office.html"></a></div>
- <div><a href="08_accessibility.html"></a></div>
- <div><a href="09_community.html"></a></div>
- </div>
-
- <div id="controls">
- <a class="control-arrow" id="prev-slide" style="display:none;"></a>
- <a class="control-arrow" id="next-slide"></a>
- <input type="hidden" id="current-slide" />
- </div>
-</div>
-
-</body>
-
-</html>
=== target is u'../../ubuntu-mate/slides/index.html'
=== modified symlink 'slideshows/oem-config-ubuntu-mate/slides/link-core'
=== target changed u'../../link-core/' => u'../../link-core'
=== removed symlink 'slideshows/oem-config-ubuntu-mate/slides/screenshots/03_usc.png'
=== target was u'../../../ubuntu-mate/slides/screenshots/03_usc.png'
=== added symlink 'slideshows/oem-config-ubuntu-mate/slides/screenshots/03_welcome.png'
=== target is u'../../../ubuntu-mate/slides/screenshots/03_welcome.png'
=== added symlink 'slideshows/oem-config-ubuntu-mate/slides/screenshots/09_community.png'
=== target is u'../../../ubuntu-mate/slides/screenshots/09_community.png'
=== modified file 'slideshows/ubuntu-mate/slides/02_about.html'
--- slideshows/ubuntu-mate/slides/02_about.html 2015-05-18 09:47:49 +0000
+++ slideshows/ubuntu-mate/slides/02_about.html 2016-01-10 15:22:11 +0000
@@ -5,7 +5,7 @@
<div class="text">
<div>
-<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>
+<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>
</div>
</div>
=== removed file 'slideshows/ubuntu-mate/slides/03_usc.html'
--- slideshows/ubuntu-mate/slides/03_usc.html 2015-08-27 11:02:40 +0000
+++ slideshows/ubuntu-mate/slides/03_usc.html 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<div class="header"><h1 class="slidetitle">Find even more software</h1></div>
-
-<div class="main">
-
- <div class="text">
- <div>
- <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>
- </div>
-
- <div class="featured">
- <h2 class="subtitle">Included software</h2>
- <ul>
- <li>
- <img class="icon" src="icons/gdebi.png"/>
- <p class="caption">GDebi Package Installer</p>
- </li>
- </ul>
- <h2 class="subtitle">Supported software</h2>
- <ul>
- <li>
- <img class="icon" src="icons/softwarecenter.png"/>
- <p class="caption">Ubuntu Software Center</p>
- </li>
- <li>
- <img class="icon" src="icons/system-software-install.png"/>
- <p class="caption">Synaptic Package Manager</p>
- </li>
- </ul>
- </div>
-
-</div>
-
-<img class="screenshot" src="screenshots/03_usc.png" />
-
-</div>
=== added file 'slideshows/ubuntu-mate/slides/03_welcome.html'
--- slideshows/ubuntu-mate/slides/03_welcome.html 1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-mate/slides/03_welcome.html 2016-01-10 15:22:11 +0000
@@ -0,0 +1,39 @@
+<div class="header"><h1 class="slidetitle">Find even more software</h1></div>
+
+<div class="main">
+
+ <div class="text">
+ <div>
+ <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>
+ </div>
+
+ <div class="featured">
+ <h2 class="subtitle">Included software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/welcome.png"/>
+ <p class="caption">Ubuntu MATE Welcome</p>
+ </li>
+ </ul>
+ <h2 class="subtitle">Supported software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/softwarecenter.png"/>
+ <p class="caption">Ubuntu Software Center</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/system-software-install.png"/>
+ <p class="caption">Synaptic Package Manager</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/gdebi.png"/>
+ <p class="caption">GDebi Package Installer</p>
+ </li>
+ </ul>
+ </div>
+
+</div>
+
+<img class="screenshot" src="screenshots/03_welcome.png" />
+
+</div>
=== modified file 'slideshows/ubuntu-mate/slides/04_music.html'
--- slideshows/ubuntu-mate/slides/04_music.html 2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/04_music.html 2016-01-10 15:22:11 +0000
@@ -15,6 +15,17 @@
<p class="caption">Rhythmbox Music Player</p>
</li>
</ul>
+ <h2 class="subtitle">Supported software</h2>
+ <ul>
+ <li>
+ <img class="icon" src="icons/banshee.png" />
+ <p class="caption">Banshee Media Player</p>
+ </li>
+ <li>
+ <img class="icon" src="icons/vlc.png" />
+ <p class="caption">VLC Media Player</p>
+ </li>
+ </ul>
</div>
</div>
=== modified file 'slideshows/ubuntu-mate/slides/05_photos.html'
--- slideshows/ubuntu-mate/slides/05_photos.html 2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/05_photos.html 2016-01-10 15:22:11 +0000
@@ -1,11 +1,11 @@
-<div class="header"><h1 class="slidetitle">Have fun with your photos</h1></div>
+<div class="header"><h1 class="slidetitle">Organise your photos</h1></div>
<div class="main">
<div class="text">
<div>
-<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>
+<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>
</div>
<div class="featured">
=== modified file 'slideshows/ubuntu-mate/slides/06_browse.html'
--- slideshows/ubuntu-mate/slides/06_browse.html 2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/06_browse.html 2016-01-10 15:22:11 +0000
@@ -5,7 +5,7 @@
<div class="text">
<div>
-<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>
+<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>
</div>
<div class="featured">
@@ -13,12 +13,11 @@
<ul>
<li>
<img class="icon" src="icons/firefox.png" />
- <p class="caption">Firefox web browser</p>
+ <p class="caption">Firefox Web Browser</p>
</li>
<li>
<img class="icon" src="icons/thunderbird.png" />
- <p class="caption">Thunderbird Mail
-</p>
+ <p class="caption">Thunderbird Mail</p>
</li>
</ul>
<h2 class="subtitle">Supported software</h2>
=== modified file 'slideshows/ubuntu-mate/slides/08_accessibility.html'
--- slideshows/ubuntu-mate/slides/08_accessibility.html 2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/08_accessibility.html 2016-01-10 15:22:11 +0000
@@ -1,4 +1,4 @@
-<div class="header"><h1 class="slidetitle">Access for everyone</h1></div>
+<div class="header"><h1 class="slidetitle">Accessible for everyone</h1></div>
<div class="main">
=== modified file 'slideshows/ubuntu-mate/slides/09_community.html'
--- slideshows/ubuntu-mate/slides/09_community.html 2015-05-18 09:47:49 +0000
+++ slideshows/ubuntu-mate/slides/09_community.html 2016-01-10 15:22:11 +0000
@@ -1,33 +1,29 @@
-<div class="header"><h1 class="slidetitle">Community</h1></div>
+<div class="header"><h1 class="slidetitle">Join the community</h1></div>
<div class="main">
<div class="text">
-<div>
-<p>We have a number of ways you can connect with the Ubuntu MATE community.</p>
-</div>
-
<div class="featured">
<h2 class="subtitle">Discussion</h2>
<ul>
<li>
<img class="icon2" src="link/bullet-point.png" />
- <a href="https://ubuntu-mate.community"; class="caption">Ubuntu MATE Forum</a>
- </li>
- <li>
- <img class="icon2" src="link/bullet-point.png" />
- <a href="https://ubuntu-mate.org/irc/"; class="caption">Ubuntu MATE IRC channel</a>
+ <a href="https://ubuntu-mate.community"; class="caption">Ubuntu MATE Community</a>
+ </li>
+ <li>
+ <img class="icon2" src="link/bullet-point.png" />
+ <a href="https://plus.google.com/communities/108331279007926658904"; class="caption">Google+ Community</a>
+ </li>
+ <li>
+ <img class="icon2" src="link/bullet-point.png" />
+ <a href="https://ubuntu-mate.org/irc/"; class="caption">IRC Channel</a>
</li>
</ul>
-<h2 class="subtitle">Social Networks</h2>
+<h2 class="subtitle">Announcements</h2>
<ul>
<li>
<img class="icon2" src="link/bullet-point.png" />
- <a href="https://plus.google.com/communities/108331279007926658904"; class="caption">Google+</a>
- </li>
- <li>
- <img class="icon2" src="link/bullet-point.png" />
<a href="https://twitter.com/ubuntu_mate"; class="caption">Twitter</a>
</li>
<li>
@@ -39,13 +35,17 @@
<ul>
<li>
<img class="icon2" src="link/bullet-point.png" />
- <a href="https://launchpad.net/ubuntu-mate"; class="caption">Ubuntu MATE Project</a>
+ <a href="https://launchpad.net/ubuntu-mate"; class="caption">Ubuntu MATE Launchpad</a>
+ </li>
+ <li>
+ <img class="icon2" src="link/bullet-point.png" />
+ <a href="https://bugs.launchpad.net/ubuntu-mate"; class="caption">Bug Tracker</a>
</li>
</ul>
</div>
</div>
-<img class="screenshot" src="screenshots/02_about.png" />
+<img class="screenshot" src="screenshots/09_community.png" />
</div>
=== added file 'slideshows/ubuntu-mate/slides/icons/banshee.png'
Binary 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
=== modified file 'slideshows/ubuntu-mate/slides/icons/firefox.png'
Binary 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
=== added file 'slideshows/ubuntu-mate/slides/icons/vlc.png'
Binary 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
=== added file 'slideshows/ubuntu-mate/slides/icons/welcome.png'
Binary 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
=== modified file 'slideshows/ubuntu-mate/slides/index.html'
--- slideshows/ubuntu-mate/slides/index.html 2015-04-01 12:05:58 +0000
+++ slideshows/ubuntu-mate/slides/index.html 2016-01-10 15:22:11 +0000
@@ -1,51 +1,38 @@
<!DOCTYPE html>
-
<html lang="en">
-
<head>
- <title>ubiquity-slideshow-ubuntu-mate</title>
-
+ <title>ubiquity-slideshow-ubuntu-mate</title>
<link href="link/base.css" rel="stylesheet" type="text/css" />
-
<base target="_blank" />
-
<script type="text/javascript" src="link-core/jquery.js"></script>
<script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
-
<script type="text/javascript" src="link-core/base.js"></script>
-
<script type="text/javascript">
SLIDESHOW_OPTIONS = {
timeout:50000,
speed:600,
}
</script>
-
<script type="text/javascript" src="link-core/slideshow.js"></script>
</head>
-
<body>
-
-<div id="wrapper">
- <div id="slideshow">
- <div><a href="01_welcome.html"></a></div>
- <div><a href="02_about.html"></a></div>
- <div><a href="03_usc.html"></a></div>
- <div><a href="04_music.html"></a></div>
- <div><a href="05_photos.html"></a></div>
- <div><a href="06_browse.html"></a></div>
- <div><a href="07_office.html"></a></div>
- <div><a href="08_accessibility.html"></a></div>
- <div><a href="09_community.html"></a></div>
- </div>
-
- <div id="controls">
- <a class="control-arrow" id="prev-slide" style="display:none;"></a>
- <a class="control-arrow" id="next-slide"></a>
- <input type="hidden" id="current-slide" />
- </div>
-</div>
-
+ <div id="wrapper">
+ <div id="slideshow">
+ <div><a href="01_welcome.html"></a></div>
+ <div><a href="02_about.html"></a></div>
+ <div><a href="03_welcome.html"></a></div>
+ <div><a href="04_music.html"></a></div>
+ <div><a href="05_photos.html"></a></div>
+ <div><a href="06_browse.html"></a></div>
+ <div><a href="07_office.html"></a></div>
+ <div><a href="08_accessibility.html"></a></div>
+ <div><a href="09_community.html"></a></div>
+ </div>
+ <div id="controls">
+ <a class="control-arrow" id="prev-slide" style="display:none;"></a>
+ <a class="control-arrow" id="next-slide"></a>
+ <input type="hidden" id="current-slide" />
+ </div>
+ </div>
</body>
-
</html>
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/02_about.png'
Binary 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
=== removed file 'slideshows/ubuntu-mate/slides/screenshots/03_usc.png'
Binary 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
=== added file 'slideshows/ubuntu-mate/slides/screenshots/03_welcome.png'
Binary 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
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/04_music.png'
Binary 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
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/05_photos.png'
Binary 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
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/06_browse.png'
Binary 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
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/07_office.png'
Binary 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
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/08_customize.png'
Binary 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
=== added file 'slideshows/ubuntu-mate/slides/screenshots/09_community.png'
Binary 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
Follow ups
