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

Proposed by Jeremy Bícha
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 769
Merged at revision: 769
Proposed branch: lp:~jbicha/ubiquity-slideshow-ubuntu/bump-version-to-1704
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 165 lines (+24/-18)
9 files modified
debian/changelog (+6/-0)
po/edubuntu/slideshow-edubuntu.pot (+1/-1)
po/kubuntu/slideshow-kubuntu.pot (+2/-2)
po/lubuntu/slideshow-lubuntu.pot (+1/-1)
po/ubuntu-gnome/slideshow-ubuntu-gnome.pot (+1/-1)
po/xubuntu/slideshow-xubuntu.pot (+10/-10)
slideshows/edubuntu/slides/welcome.html (+1/-1)
slideshows/lubuntu/slides/00_welcome.html (+1/-1)
slideshows/ubuntu-gnome/slides/welcome.html (+1/-1)
To merge this branch: bzr merge lp:~jbicha/ubiquity-slideshow-ubuntu/bump-version-to-1704
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+320737@code.launchpad.net

Description of the change

To post a comment you must log in.
769. By Jeremy Bícha

Add LP bug number for sponsoring

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1ubiquity-slideshow-ubuntu (122) UNRELEASED; urgency=medium
2
3 * Update version strings to 17.04 (LP: #1667473)
4
5 -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 22 Mar 2017 18:36:20 -0400
6
1ubiquity-slideshow-ubuntu (121) zesty; urgency=medium7ubiquity-slideshow-ubuntu (121) zesty; urgency=medium
28
3 [ Will Cooke ]9 [ Will Cooke ]
410
=== 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 @@
638#. type: Content of: <div><div><ul><p>638#. type: Content of: <div><div><ul><p>
639#: slideshows/edubuntu/slides/welcome.html:7639#: slideshows/edubuntu/slides/welcome.html:7
640msgid ""640msgid ""
641"Thank you for installing Edubuntu 16.10. The Edubuntu project is a "641"Thank you for installing Edubuntu 17.04. The Edubuntu project is a "
642"community project that aims to provide a whole-school technological platform "642"community project that aims to provide a whole-school technological platform "
643"suitable for delivering education. We are coders, educators, parents and "643"suitable for delivering education. We are coders, educators, parents and "
644"technologists who aim to make technology easier for all."644"technologists who aim to make technology easier for all."
645645
=== 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 @@
313313
314#. type: Content of: <div><div><ul><li>314#. type: Content of: <div><div><ul><li>
315#: slideshows/kubuntu/slides/welcome.html:6315#: slideshows/kubuntu/slides/welcome.html:6
316msgid "Thank you for choosing Kubuntu 16.10. We hope you enjoy the experience."316msgid "Thank you for choosing Kubuntu 17.04. We hope you enjoy the experience."
317msgstr ""317msgstr ""
318318
319#. type: Content of: <div><div><ul><li>319#. type: Content of: <div><div><ul><li>
@@ -328,7 +328,7 @@
328#: slideshows/kubuntu/slides/welcome.html:11328#: slideshows/kubuntu/slides/welcome.html:11
329msgid ""329msgid ""
330"We want Kubuntu to work for you. So while your software is installing, this "330"We want Kubuntu to work for you. So while your software is installing, this "
331"slideshow will introduce you to Kubuntu 16.10."331"slideshow will introduce you to Kubuntu 17.04."
332msgstr ""332msgstr ""
333333
334#. type: Content of: <div><div><p>334#. type: Content of: <div><div><p>
335335
=== 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 @@
1818
19#. type: Content of: <div><h1>19#. type: Content of: <div><h1>
20#: slideshows/lubuntu/slides/00_welcome.html:120#: slideshows/lubuntu/slides/00_welcome.html:1
21msgid "Welcome to Lubuntu 16.10"21msgid "Welcome to Lubuntu 17.04"
22msgstr ""22msgstr ""
2323
24#. type: Content of: <div><div><div><p>24#. type: Content of: <div><div><div><p>
2525
=== 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 @@
186186
187#. type: Content of: <div><h1>187#. type: Content of: <div><h1>
188#: slideshows/ubuntu-gnome/slides/welcome.html:2188#: slideshows/ubuntu-gnome/slides/welcome.html:2
189msgid "Welcome to Ubuntu GNOME 16.10"189msgid "Welcome to Ubuntu GNOME 17.04"
190msgstr ""190msgstr ""
191191
192#. type: Content of: <div><div><div><p>192#. type: Content of: <div><div><div><p>
193193
=== 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 @@
7msgid ""7msgid ""
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"POT-Creation-Date: 2017-01-19 12:23-0500\n"10"POT-Creation-Date: 2017-03-22 18:47-0400\n"
11"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"11"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: LANGUAGE <LL@li.org>\n"13"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,15 +28,15 @@
2828
29#. type: Content of: <div><div><p>29#. type: Content of: <div><div><p>
30#: slideshows/xubuntu/slides/00_welcome.html:530#: slideshows/xubuntu/slides/00_welcome.html:5
31msgid "Xubuntu 16.10!"31msgid "Xubuntu 17.04!"
32msgstr ""32msgstr ""
3333
34#. type: Content of: <div><div><p>34#. type: Content of: <div><div><p>
35#: slideshows/xubuntu/slides/00_welcome.html:635#: slideshows/xubuntu/slides/00_welcome.html:6
36msgid ""36msgid ""
37"If you are running this installation via the <em>Try Xubuntu</em> option, "37"If you are running the installation from the <em>Try Xubuntu</em> option, "
38"feel free to examine things as Xubuntu installs. After the installation, the "38"you can use the default applications while installing. You can even install "
39"desktop will look similar to how it does now."39"new packages to try at the same time."
40msgstr ""40msgstr ""
4141
42#. type: Content of: <div><div><div>42#. type: Content of: <div><div><div>
@@ -62,9 +62,9 @@
62#. type: Content of: <div><div><p>62#. type: Content of: <div><div><p>
63#: slideshows/xubuntu/slides/01_applications.html:563#: slideshows/xubuntu/slides/01_applications.html:5
64msgid ""64msgid ""
65"Here is a list of some applications that are preinstalled with Xubuntu for "65"Here are some of the applications that we feel best suit Xubuntu and its "
66"your convenience. Find them in the applications menu and install more with "66"users. Find them in the applications menu and install more with the package "
67"the package manager."67"manager."
68msgstr ""68msgstr ""
6969
70#. type: Content of: <div><div><div>70#. type: Content of: <div><div><div>
@@ -213,8 +213,8 @@
213#. type: Content of: <div><div><p>213#. type: Content of: <div><div><p>
214#: slideshows/xubuntu/slides/05_contribute.html:5214#: slideshows/xubuntu/slides/05_contribute.html:5
215msgid ""215msgid ""
216"Like what you see? Like what you use? Why not join in? You don't have to be "216"Ever wondered if you could help Xubuntu? You don't have to be able to code – "
217"able to code – there are many different parts we need help with."217"there are many different areas we need help with."
218msgstr ""218msgstr ""
219219
220#. type: Content of: <div><div><p>220#. type: Content of: <div><div><p>
221221
=== 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 @@
44
5<div class="content wrap-top" style="top: -40px; position: absolute;"><ul>5<div class="content wrap-top" style="top: -40px; position: absolute;"><ul>
66
7<p style="text-align: justify;">Thank you for installing Edubuntu 16.10.7<p style="text-align: justify;">Thank you for installing Edubuntu 17.04.
8The 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>8The 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>
99
10<p>While the installer is copying some files to disk, we'll show you some slides to introduce you to the Edubuntu Desktop system.10<p>While the installer is copying some files to disk, we'll show you some slides to introduce you to the Edubuntu Desktop system.
1111
=== 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 @@
1<div class="header"><h1 class="slidetitle">Welcome to Lubuntu 16.10</h1></div>1<div class="header"><h1 class="slidetitle">Welcome to Lubuntu 17.04</h1></div>
22
3<div class="main">3<div class="main">
44
55
=== 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 @@
1<div class="header">1<div class="header">
2 <h1 class="slidetitle">Welcome to Ubuntu GNOME 16.10</h1>2 <h1 class="slidetitle">Welcome to Ubuntu GNOME 17.04</h1>
3</div>3</div>
44
5<div class="main big">5<div class="main big">

Subscribers

People subscribed via source and target branches