Merge lp:~jbicha/ubiquity-slideshow-ubuntu/bump-version-to-1704 into lp:ubiquity-slideshow-ubuntu

[Jeremy Bícha]

This updates all the flavors to 17.04 except Kylin.

https://code.launchpad.net/~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-1704

[lp:~jbicha/ubiquity-slideshow-ubuntu/bump-version-to-1704]

769. By Jeremy Bícha on 2017-03-22

Add LP bug number for sponsoring

[Mathieu Trudel-Lapierre (cyphermox)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-20 15:57:58 +0000
+++ debian/changelog	2017-03-22 22:57:23 +0000
@@ -1,3 +1,9 @@
+ubiquity-slideshow-ubuntu (122) UNRELEASED; urgency=medium
+
+  * Update version strings to 17.04 (LP: #1667473)
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 22 Mar 2017 18:36:20 -0400
+
 ubiquity-slideshow-ubuntu (121) zesty; urgency=medium
 
   [ Will Cooke ]

=== modified file 'po/edubuntu/slideshow-edubuntu.pot'
--- po/edubuntu/slideshow-edubuntu.pot	2017-01-19 18:15:29 +0000
+++ po/edubuntu/slideshow-edubuntu.pot	2017-03-22 22:57:23 +0000
@@ -638,7 +638,7 @@
 #. type: Content of: <div><div><ul><p>
 #: slideshows/edubuntu/slides/welcome.html:7
 msgid ""
-"Thank you for installing Edubuntu 16.10.  The Edubuntu project is a "
+"Thank you for installing Edubuntu 17.04.  The Edubuntu project is a "
 "community project that aims to provide a whole-school technological platform "
 "suitable for delivering education. We are coders, educators, parents and "
 "technologists who aim to make technology easier for all."

=== modified file 'po/kubuntu/slideshow-kubuntu.pot'
--- po/kubuntu/slideshow-kubuntu.pot	2017-01-19 18:15:29 +0000
+++ po/kubuntu/slideshow-kubuntu.pot	2017-03-22 22:57:23 +0000
@@ -313,7 +313,7 @@
 
 #. type: Content of: <div><div><ul><li>
 #: slideshows/kubuntu/slides/welcome.html:6
-msgid "Thank you for choosing Kubuntu 16.10. We hope you enjoy the experience."
+msgid "Thank you for choosing Kubuntu 17.04. We hope you enjoy the experience."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -328,7 +328,7 @@
 #: slideshows/kubuntu/slides/welcome.html:11
 msgid ""
 "We want Kubuntu to work for you. So while your software is installing, this "
-"slideshow will introduce you to Kubuntu 16.10."
+"slideshow will introduce you to Kubuntu 17.04."
 msgstr ""
 
 #. type: Content of: <div><div><p>

=== modified file 'po/lubuntu/slideshow-lubuntu.pot'
--- po/lubuntu/slideshow-lubuntu.pot	2017-01-19 18:15:29 +0000
+++ po/lubuntu/slideshow-lubuntu.pot	2017-03-22 22:57:23 +0000
@@ -18,7 +18,7 @@
 
 #. type: Content of: <div><h1>
 #: slideshows/lubuntu/slides/00_welcome.html:1
-msgid "Welcome to Lubuntu 16.10"
+msgid "Welcome to Lubuntu 17.04"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>

=== modified file 'po/ubuntu-gnome/slideshow-ubuntu-gnome.pot'
--- po/ubuntu-gnome/slideshow-ubuntu-gnome.pot	2017-01-19 18:15:29 +0000
+++ po/ubuntu-gnome/slideshow-ubuntu-gnome.pot	2017-03-22 22:57:23 +0000
@@ -186,7 +186,7 @@
 
 #. type: Content of: <div><h1>
 #: slideshows/ubuntu-gnome/slides/welcome.html:2
-msgid "Welcome to Ubuntu GNOME 16.10"
+msgid "Welcome to Ubuntu GNOME 17.04"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>

=== modified file 'po/xubuntu/slideshow-xubuntu.pot'
--- po/xubuntu/slideshow-xubuntu.pot	2017-01-19 18:15:29 +0000
+++ po/xubuntu/slideshow-xubuntu.pot	2017-03-22 22:57:23 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-01-19 12:23-0500\n"
+"POT-Creation-Date: 2017-03-22 18:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -28,15 +28,15 @@
 
 #. type: Content of: <div><div><p>
 #: slideshows/xubuntu/slides/00_welcome.html:5
-msgid "Xubuntu 16.10!"
+msgid "Xubuntu 17.04!"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: slideshows/xubuntu/slides/00_welcome.html:6
 msgid ""
-"If you are running this installation via the <em>Try Xubuntu</em> option, "
-"feel free to examine things as Xubuntu installs. After the installation, the "
-"desktop will look similar to how it does now."
+"If you are running the installation from the <em>Try Xubuntu</em> option, "
+"you can use the default applications while installing. You can even install "
+"new packages to try at the same time."
 msgstr ""
 
 #. type: Content of: <div><div><div>
@@ -62,9 +62,9 @@
 #. type: Content of: <div><div><p>
 #: slideshows/xubuntu/slides/01_applications.html:5
 msgid ""
-"Here is a list of some applications that are preinstalled with Xubuntu for "
-"your convenience. Find them in the applications menu and install more with "
-"the package manager."
+"Here are some of the applications that we feel best suit Xubuntu and its "
+"users. Find them in the applications menu and install more with the package "
+"manager."
 msgstr ""
 
 #. type: Content of: <div><div><div>
@@ -213,8 +213,8 @@
 #. type: Content of: <div><div><p>
 #: slideshows/xubuntu/slides/05_contribute.html:5
 msgid ""
-"Like what you see? Like what you use? Why not join in? You don't have to be "
-"able to code – there are many different parts we need help with."
+"Ever wondered if you could help Xubuntu? You don't have to be able to code – "
+"there are many different areas we need help with."
 msgstr ""
 
 #. type: Content of: <div><div><p>

=== modified file 'slideshows/edubuntu/slides/welcome.html'
--- slideshows/edubuntu/slides/welcome.html	2016-09-13 16:03:22 +0000
+++ slideshows/edubuntu/slides/welcome.html	2017-03-22 22:57:23 +0000
@@ -4,7 +4,7 @@
 
 <div class="content wrap-top" style="top: -40px; position: absolute;"><ul>
 
-<p style="text-align: justify;">Thank you for installing Edubuntu 16.10.
+<p style="text-align: justify;">Thank you for installing Edubuntu 17.04.
 The Edubuntu project is a community project that aims to provide a whole-school technological platform suitable for delivering education. We are coders, educators, parents and technologists who aim to make technology easier for all.</p>
 
 <p>While the installer is copying some files to disk, we'll show you some slides to introduce you to the Edubuntu Desktop system.

=== modified file 'slideshows/lubuntu/slides/00_welcome.html'
--- slideshows/lubuntu/slides/00_welcome.html	2016-09-13 16:03:22 +0000
+++ slideshows/lubuntu/slides/00_welcome.html	2017-03-22 22:57:23 +0000
@@ -1,4 +1,4 @@
-<div class="header"><h1 class="slidetitle">Welcome to Lubuntu 16.10</h1></div>
+<div class="header"><h1 class="slidetitle">Welcome to Lubuntu 17.04</h1></div>
 
 <div class="main">
 

=== modified file 'slideshows/ubuntu-gnome/slides/welcome.html'
--- slideshows/ubuntu-gnome/slides/welcome.html	2016-09-13 10:02:25 +0000
+++ slideshows/ubuntu-gnome/slides/welcome.html	2017-03-22 22:57:23 +0000
@@ -1,5 +1,5 @@
 <div class="header">
-	<h1 class="slidetitle">Welcome to Ubuntu GNOME 16.10</h1>
+	<h1 class="slidetitle">Welcome to Ubuntu GNOME 17.04</h1>
 </div>
 
 <div class="main big">