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

[Martin Wimpress ]

  * Update Ubuntu MATE slides to reflect new default apps. (LP: #1843297, #1843311)
  * debian/control:
    + Change Conflicts/Replaces from oem-config-slideshow-ubuntu to
      oem-config-slideshow for oem-slideshow-ubuntu-{mate,budgie}
      (LP: #1842047, #1713720)

[Will Cooke (willcooke)]

Changes to the strings (and the screenshots) will require a UIFe. Please email the docs team with the info. You should also link that request to a bug, perhaps 1843297 or just a new one.

review: Needs Fixing

[Martin Wimpress  (flexiondotorg)]

I've linked the appropriate bugs and got agreement to proceed from the docs team. I've already contacted active translators so they are aware.

review: Needs Resubmitting

[Sebastien Bacher (seb128)]

There is UIFe approval comment on the bugs, would be nice to have one but merging/uploading trusting you real got approval (it still needs to be approved by the r-t then so maybe worth getting the bugs updated for the record)

review: Approve

=== modified file 'debian/control'
--- debian/control	2018-05-16 03:41:09 +0000
+++ debian/control	2019-09-28 13:51:55 +0000
@@ -101,8 +101,8 @@
 Package: oem-config-slideshow-ubuntu-mate
 Architecture: all
 Provides: oem-config-slideshow
-Conflicts: oem-config-slideshow-ubuntu
-Replaces: oem-config-slideshow-ubuntu
+Conflicts: oem-config-slideshow
+Replaces: oem-config-slideshow
 Depends: ${misc:Depends}
 Description: OEM slideshow for Ubuntu MATE
  A slideshow intended for the post-OEM-install configuration, designed
@@ -111,8 +111,8 @@
 Package: oem-config-slideshow-ubuntu-budgie
 Architecture: all
 Provides: oem-config-slideshow
-Conflicts: oem-config-slideshow-ubuntu
-Replaces: oem-config-slideshow-ubuntu
+Conflicts: oem-config-slideshow
+Replaces: oem-config-slideshow
 Depends: ${misc:Depends}
 Description: OEM slideshow for Ubuntu Budgie
  A slideshow intended for the post-OEM-install configuration, designed

=== modified file 'slideshows/ubuntu-mate/slides/03_getting_started.html'
--- slideshows/ubuntu-mate/slides/03_getting_started.html	2017-08-23 22:42:54 +0000
+++ slideshows/ubuntu-mate/slides/03_getting_started.html	2019-09-28 13:51:55 +0000
@@ -6,12 +6,12 @@
     <div>
       <p>Ubuntu MATE Welcome greets and assists new and returning
       users. The <strong>Getting Started</strong> wizard will guide you
-      through the first boot post-installation setup and configuration
-      of additional peripherals and devices and the documentation will
+      through the first boot post-installation setup and the configuration
+      of additional peripherals and devices, while the documentation will
       help orientate new users. The <strong>Systems
       Specifications</strong> section will help you explore your
-      hardware and offers one-click install and launch of many useful
-      system monitoring tools. When you need support Ubuntu MATE
+      hardware and offers one-click installation for many useful
+      system monitoring tools. When you need help Ubuntu MATE
       Welcome is the jumping off point to the community.</p>
     </div>
     <div class="featured">
@@ -25,4 +25,4 @@
     </div>
   </div>
   <img class="screenshot" src="screenshots/03_getting_started.png"/>
-</div>
\ No newline at end of file
+</div>

=== modified file 'slideshows/ubuntu-mate/slides/05_tweak.html'
--- slideshows/ubuntu-mate/slides/05_tweak.html	2017-08-23 22:42:54 +0000
+++ slideshows/ubuntu-mate/slides/05_tweak.html	2019-09-28 13:51:55 +0000
@@ -6,7 +6,7 @@
     <div>
       <p>The default Ubuntu MATE user interface is intuitive and easy
       to use. But we understand people have different tastes and
-      preferences which is why we created <strong>MATE Tweak</strong>,
+      preferences, which is why we created <strong>MATE Tweak</strong>;
       a tool to change the user interface to mimic other operating
       systems. Coming from Windows? Try <strong>Redmond</strong>.
       Prefer the way macOS is layed out? Try <strong>Cupertino</strong>.
@@ -26,4 +26,4 @@
     </div>
   </div>
   <img class="screenshot" src="screenshots/05_tweak.png"/>
-</div>
\ No newline at end of file
+</div>

=== modified file 'slideshows/ubuntu-mate/slides/06_browse.html'
--- slideshows/ubuntu-mate/slides/06_browse.html	2017-08-23 22:42:54 +0000
+++ slideshows/ubuntu-mate/slides/06_browse.html	2019-09-28 13:51:55 +0000
@@ -20,8 +20,8 @@
 	  <p class="caption">Firefox</p>
 	</li>
 	<li>
-	  <img class="icon" src="icons/thunderbird.png"/>
-	  <p class="caption">Thunderbird Mail</p>
+	  <img class="icon" src="icons/evolution.png"/>
+	  <p class="caption">Evolution</p>
 	</li>
       </ul>
       <h2 class="subtitle">Supported software</h2>
@@ -34,4 +34,4 @@
    </div>
   </div>
   <img class="screenshot" src="screenshots/06_browse.png"/>
-</div>
\ No newline at end of file
+</div>

=== modified file 'slideshows/ubuntu-mate/slides/08_music.html'
--- slideshows/ubuntu-mate/slides/08_music.html	2017-08-23 22:42:54 +0000
+++ slideshows/ubuntu-mate/slides/08_music.html	2019-09-28 13:51:55 +0000
@@ -9,8 +9,7 @@
       perfect songs. And it works great with CDs and portable music
       players, so you can enjoy all your music wherever you go. If you
       prefer streaming services you'll find <strong>Spotify</strong>
-      and <strong>Nuvola Player</strong>, which supports many popular
-      streaming services, in the <strong>Software Boutique</strong></p>
+      in the <strong>Software Boutique</strong>.</p>
     </div>
     <div class="featured">
       <h2 class="subtitle">Included software</h2>
@@ -20,11 +19,11 @@
           <p class="caption">Rhythmbox Music Player</p>
         </li>
         <li>
-          <img class="icon" src="icons/vlc.png"/>
-          <p class="caption">VLC</p>
+          <img class="icon" src="icons/celluloid.png"/>
+          <p class="caption">Celluloid</p>
         </li>
       </ul>
     </div>
   </div>
   <img class="screenshot" src="screenshots/08_music.png"/>
-</div>
\ No newline at end of file
+</div>

=== modified file 'slideshows/ubuntu-mate/slides/10_video.html'
--- slideshows/ubuntu-mate/slides/10_video.html	2018-09-27 19:10:21 +0000
+++ slideshows/ubuntu-mate/slides/10_video.html	2019-09-28 13:51:55 +0000
@@ -9,18 +9,18 @@
       you can watch content from your favourite streaming services such
       as <strong>Netflix</strong> and <strong>YouTube</strong>.</p>
       <br />
-      <p>With <strong>VLC</strong> installed by default you can watch
-      all you local video with ease.</p>
+      <p>With <strong>Celluloid</strong> installed by default you can
+      watch all your local video with ease.</p>
     </div>
     <div class="featured">
       <h2 class="subtitle">Included software</h2>
       <ul>
         <li>
-          <img class="icon" src="icons/vlc.png"/>
-          <p class="caption">VLC</p>
+          <img class="icon" src="icons/celluloid.png"/>
+          <p class="caption">Celluloid</p>
         </li>
       </ul>
     </div>
   </div>
   <img class="screenshot" src="screenshots/10_video.png"/>
-</div>
\ No newline at end of file
+</div>

=== modified file 'slideshows/ubuntu-mate/slides/13_community.html'
--- slideshows/ubuntu-mate/slides/13_community.html	2017-08-23 22:42:54 +0000
+++ slideshows/ubuntu-mate/slides/13_community.html	2019-09-28 13:51:55 +0000
@@ -12,10 +12,6 @@
         </li>
         <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://ubuntu-mate.org/irc/" class="caption">Live Chat</a>
         </li>
       </ul>
@@ -44,4 +40,4 @@
     </div>
   </div>
   <img class="screenshot" src="screenshots/13_community.png"/>
-</div>
\ No newline at end of file
+</div>

=== added file 'slideshows/ubuntu-mate/slides/icons/celluloid.png'
Binary files slideshows/ubuntu-mate/slides/icons/celluloid.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/icons/celluloid.png	2019-09-28 13:51:55 +0000 differ
=== removed file 'slideshows/ubuntu-mate/slides/icons/emby.png'
Binary files slideshows/ubuntu-mate/slides/icons/emby.png	2017-08-23 22:42:54 +0000 and slideshows/ubuntu-mate/slides/icons/emby.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu-mate/slides/icons/eom.png'
Binary files slideshows/ubuntu-mate/slides/icons/eom.png	2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/icons/eom.png	1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/ubuntu-mate/slides/icons/evolution.png'
Binary files slideshows/ubuntu-mate/slides/icons/evolution.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/icons/evolution.png	2019-09-28 13:51:55 +0000 differ
=== removed file 'slideshows/ubuntu-mate/slides/icons/thunderbird.png'
Binary files slideshows/ubuntu-mate/slides/icons/thunderbird.png	2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/icons/thunderbird.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu-mate/slides/icons/vlc.png'
Binary files slideshows/ubuntu-mate/slides/icons/vlc.png	2016-01-10 15:19:40 +0000 and slideshows/ubuntu-mate/slides/icons/vlc.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu-mate/slides/screenshots/10_video.png'
Binary files slideshows/ubuntu-mate/slides/screenshots/10_video.png	2018-02-26 17:26:03 +0000 and slideshows/ubuntu-mate/slides/screenshots/10_video.png	2019-09-28 13:51:55 +0000 differ