← Back to team overview

ubiquity-slideshow team mailing list archive

[Merge] lp:~ubuntugnome-marketing/ubiquity-slideshow-ubuntu/ubuntugnome-1604 into lp:ubiquity-slideshow-ubuntu

 

Alfredo Hernández has proposed merging lp:~ubuntugnome-marketing/ubiquity-slideshow-ubuntu/ubuntugnome-1604 into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Ubiquity Slideshow (ubiquity-slideshow)

For more details, see:
https://code.launchpad.net/~ubuntugnome-marketing/ubiquity-slideshow-ubuntu/ubuntugnome-1604/+merge/288495

We've updated the slides:
 - browse: updated screenshot.
 - usc: deleted (as Ubuntu GNOME now uses GNOME Software).
 - software: based upon usc, shows slightly updated text, new screenshot and updated icons.
-- 
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~ubuntugnome-marketing/ubiquity-slideshow-ubuntu/ubuntugnome-1604 into lp:ubiquity-slideshow-ubuntu.
=== removed file 'slideshows/ubuntu-gnome/slides/icons/gnome-contacts.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gnome-contacts.png	2015-04-01 00:01:34 +0000 and slideshows/ubuntu-gnome/slides/icons/gnome-contacts.png	1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/icons/gnome-software.png'
Binary files slideshows/ubuntu-gnome/slides/icons/gnome-software.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/icons/gnome-software.png	2016-03-09 10:42:54 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/icons/rhythmbox.png'
Binary files slideshows/ubuntu-gnome/slides/icons/rhythmbox.png	2015-04-01 00:01:34 +0000 and slideshows/ubuntu-gnome/slides/icons/rhythmbox.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/icons/softwarecenter.png'
Binary files slideshows/ubuntu-gnome/slides/icons/softwarecenter.png	2015-08-30 07:21:38 +0000 and slideshows/ubuntu-gnome/slides/icons/softwarecenter.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu-gnome/slides/icons/system-software-update.png'
Binary files slideshows/ubuntu-gnome/slides/icons/system-software-update.png	2015-08-30 07:21:38 +0000 and slideshows/ubuntu-gnome/slides/icons/system-software-update.png	2016-03-09 10:42:54 +0000 differ
=== modified file 'slideshows/ubuntu-gnome/slides/index.html'
--- slideshows/ubuntu-gnome/slides/index.html	2015-08-30 07:21:38 +0000
+++ slideshows/ubuntu-gnome/slides/index.html	2016-03-09 10:42:54 +0000
@@ -3,25 +3,25 @@
 <html lang="en">
 	<head>
 		<title>ubiquity-slideshow-ubuntu-gnome</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/twitter.js"></script>
-		
+
 		<script type="text/javascript" src="link-core/slideshow.js"></script>
 	</head>
 
@@ -35,7 +35,7 @@
 				<div><a href="office.html"></a></div>
 				<div><a href="media.html"></a></div>
 				<div><a href="photos.html"></a></div>
-				<div><a href="usc.html"></a></div>
+				<div><a href="software.html"></a></div>
 				<div><a href="accessibility.html"></a></div>
 				<!-- <div><a href="migrate.html"></a></div> -->
 				<div><a href="gethelp.html"></a></div>

=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/browse.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/browse.png	2015-08-30 07:21:38 +0000 and slideshows/ubuntu-gnome/slides/screenshots/browse.png	2016-03-09 10:42:54 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/screenshots/software.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/software.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu-gnome/slides/screenshots/software.png	2016-03-09 10:42:54 +0000 differ
=== removed file 'slideshows/ubuntu-gnome/slides/screenshots/usc.png'
Binary files slideshows/ubuntu-gnome/slides/screenshots/usc.png	2015-08-30 07:21:38 +0000 and slideshows/ubuntu-gnome/slides/screenshots/usc.png	1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-gnome/slides/software.html'
--- slideshows/ubuntu-gnome/slides/software.html	1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu-gnome/slides/software.html	2016-03-09 10:42:54 +0000
@@ -0,0 +1,25 @@
+<div class="header">
+	<h1 class="slidetitle">Find even more software</h1>
+</div>
+
+<div class="main">
+	<div class="text">
+		<div>
+			<p><strong>Say Goodbye to searching the web for a software.</strong> <br /> <br />
+			With GNOME Software you can easily find and install software. Your ratings and reviews are used to rank software by popularity. You have access to thousands of free and commercial applications. Installing anything is just a couple of clicks away from you.
+		</div>
+
+		<div class="bigicon">
+			<ul>
+				<li>
+					<img src="icons/gnome-software.png"/>
+				</li>
+				<li>
+					<img src="icons/system-software-update.png"/>
+				</li>
+			</ul>
+		</div>
+	</div>
+
+	<img class="screenshot" src="screenshots/software.png" />
+</div>

=== removed file 'slideshows/ubuntu-gnome/slides/usc.html'
--- slideshows/ubuntu-gnome/slides/usc.html	2015-08-30 07:21:38 +0000
+++ slideshows/ubuntu-gnome/slides/usc.html	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<div class="header">
-	<h1 class="slidetitle">Find even more software</h1>
-</div>
-
-<div class="main">
-	<div class="text">
-		<div>
-			<p><strong>Say Goodbye to searching the web for a software.</strong></p> <br /> <br />
-			With Ubuntu Software Center you can easily find and install software. Your ratings and reviews are used to rank software by popularity. You have access to thousands of free and commercial applications. Installing anything is just a couple of clicks away from you.
-		</div>
-
-		<div class="bigicon">
-			<ul>
-				<li>
-					<img src="icons/softwarecenter.png"/>
-				</li>
-				<li>
-					<img src="icons/system-software-update.png"/>
-				</li>
-			</ul>
-		</div>
-	</div>
-
-	<img class="screenshot" src="screenshots/usc.png" />
-</div>


Follow ups