← Back to team overview

ubiquity-slideshow team mailing list archive

[Merge] lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-update into lp:ubiquity-slideshow-ubuntu

 

Martin Wimpress has proposed merging lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-update into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Ubuntu Sponsors Team (ubuntu-sponsors)
  Ubiquity Slideshow (ubiquity-slideshow)

For more details, see:
https://code.launchpad.net/~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-update/+merge/259371

A few minor changes to the text in the Ubuntu MATE slides to remove an errant scroll-bar and tweak up the language.
-- 
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-update into lp:ubiquity-slideshow-ubuntu.
=== modified file 'slideshows/ubuntu-mate/slides/02_about.html'
--- slideshows/ubuntu-mate/slides/02_about.html	2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/02_about.html	2015-05-18 12:21:29 +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 desktops, laptops and netbooks and prefer a traditional desktop metaphor. With modest hardware requirements it is suitable for modern workstations 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 desktops and laptops, micro computers and older hardware alike.</p>
 </div>
 
 </div>

=== modified file 'slideshows/ubuntu-mate/slides/03_usc.html'
--- slideshows/ubuntu-mate/slides/03_usc.html	2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/03_usc.html	2015-05-18 12:21:29 +0000
@@ -23,7 +23,7 @@
 	        	</li>
 			<li>
 				<img class="icon" src="icons/gdebi.png"/>
-	        		<p class="caption">GDebi Package Installer</p>
+	        		<p class="caption">gdebi Package Installer</p>
 	        	</li>
 		</ul>
 	</div>

=== modified file 'slideshows/ubuntu-mate/slides/09_community.html'
--- slideshows/ubuntu-mate/slides/09_community.html	2015-04-01 12:05:58 +0000
+++ slideshows/ubuntu-mate/slides/09_community.html	2015-05-18 12:21:29 +0000
@@ -24,15 +24,15 @@
 <ul>
 	<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://twitter.com/ubuntu_mate"; class="caption">Twitter Feed</a>
-	</li>
-	<li>
-		<img class="icon2" src="link/bullet-point.png" />
-		<a href="https://www.facebook.com/UbuntuMATEedition"; class="caption">Facebook Page</a>
+		<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>
+		<img class="icon2" src="link/bullet-point.png" />
+		<a href="https://www.facebook.com/UbuntuMATEedition"; class="caption">Facebook</a>
 	</li>
 </ul>
 <h2 class="subtitle">Development</h2>
@@ -41,10 +41,6 @@
 		<img class="icon2" src="link/bullet-point.png" />
 		<a href="https://launchpad.net/ubuntu-mate"; class="caption">Ubuntu MATE Project</a>
 	</li>
-	<li>
-		<img class="icon2" src="link/bullet-point.png" />
-		<a href="https://bugs.launchpad.net/ubuntu-mate"; class="caption">Ubuntu MATE Bug Tracker</a>
-	</li>
 </ul>
 </div>