Merge lp:~feng-kylin/ubiquity-slideshow-ubuntu/ubuntukylin-groovy into lp:ubiquity-slideshow-ubuntu

Proposed by handsome_feng
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 879
Merged at revision: 883
Proposed branch: lp:~feng-kylin/ubiquity-slideshow-ubuntu/ubuntukylin-groovy
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 66 lines (+5/-7)
4 files modified
po/ubuntukylin/slideshow-ubuntukylin.pot (+2/-3)
slideshows/ubuntukylin/slides/hardware.html (+1/-1)
slideshows/ubuntukylin/slides/index.html (+0/-1)
slideshows/ubuntukylin/slides/stablekernel.html (+2/-2)
To merge this branch: bzr merge lp:~feng-kylin/ubiquity-slideshow-ubuntu/ubuntukylin-groovy
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+391419@code.launchpad.net

Commit message

Adjust the slideshow for Ubuntu Kylin groovy.

To post a comment you must log in.
Revision history for this message
handsome_feng (feng-kylin) wrote :

Hi, could anyone review this? Groovy is about to be released.

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/ubuntukylin/slideshow-ubuntukylin.pot'
--- po/ubuntukylin/slideshow-ubuntukylin.pot 2020-03-13 03:51:57 +0000
+++ po/ubuntukylin/slideshow-ubuntukylin.pot 2020-09-28 07:58:47 +0000
@@ -45,8 +45,7 @@
45#. type: Content of: <div><div><h3>45#. type: Content of: <div><div><h3>
46#: slideshows/ubuntukylin/slides/hardware.html:546#: slideshows/ubuntukylin/slides/hardware.html:5
47msgid ""47msgid ""
48"Supporting mainstream hardware platforms including Intel, AMD, Kunpeng and "48"Supporting mainstream hardware platforms including Intel, AMD, ARM"
49"Phytium"
50msgstr ""49msgstr ""
5150
52#. type: Content of: <div><div><div><h1>51#. type: Content of: <div><div><div><h1>
@@ -161,7 +160,7 @@
161160
162#. type: Content of: <div><div><h3>161#. type: Content of: <div><div><h3>
163#: slideshows/ubuntukylin/slides/stablekernel.html:7162#: slideshows/ubuntukylin/slides/stablekernel.html:7
164msgid "Linux 5.4 LTS kernel inside, covering latest cutting-edge technologies"163msgid "Linux 5.8 LTS kernel inside, covering latest cutting-edge technologies"
165msgstr ""164msgstr ""
166165
167#. type: Content of: <div><div><h3>166#. type: Content of: <div><div><h3>
168167
=== modified file 'slideshows/ubuntukylin/slides/hardware.html'
--- slideshows/ubuntukylin/slides/hardware.html 2020-03-11 10:09:10 +0000
+++ slideshows/ubuntukylin/slides/hardware.html 2020-09-28 07:58:47 +0000
@@ -2,7 +2,7 @@
2<div class="text">2<div class="text">
33
4<h3 style="text-align:center; font-size:34px; margin-top:40px; margin-bottom:30px; font-weight:bold; color:white">Mainstream Hardware Platforms</h3>4<h3 style="text-align:center; font-size:34px; margin-top:40px; margin-bottom:30px; font-weight:bold; color:white">Mainstream Hardware Platforms</h3>
5<h3 style="text-align:center; font-size:16px; font-weight:bold; line-height:28px; color:white">Supporting mainstream hardware platforms including Intel, AMD, Kunpeng and Phytium</h3>5<h3 style="text-align:center; font-size:16px; font-weight:bold; line-height:28px; color:white">Supporting mainstream hardware platforms including Intel, AMD, ARM</h3>
66
7</div>7</div>
88
99
=== modified file 'slideshows/ubuntukylin/slides/index.html'
--- slideshows/ubuntukylin/slides/index.html 2020-03-11 10:09:10 +0000
+++ slideshows/ubuntukylin/slides/index.html 2020-09-28 07:58:47 +0000
@@ -35,7 +35,6 @@
35 <div><a href="panel.html"></a></div>35 <div><a href="panel.html"></a></div>
36 <div><a href="control-center.html"></a></div>36 <div><a href="control-center.html"></a></div>
37 <div><a href="rich-applications.html"></a></div>37 <div><a href="rich-applications.html"></a></div>
38 <div><a href="long-support.html"></a></div>
39 </div>38 </div>
4039
41 <div id="controls">40 <div id="controls">
4241
=== added file 'slideshows/ubuntukylin/slides/screenshots/stablekernel-2010.jpg'
43Binary files slideshows/ubuntukylin/slides/screenshots/stablekernel-2010.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntukylin/slides/screenshots/stablekernel-2010.jpg 2020-09-28 07:58:47 +0000 differ42Binary files slideshows/ubuntukylin/slides/screenshots/stablekernel-2010.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntukylin/slides/screenshots/stablekernel-2010.jpg 2020-09-28 07:58:47 +0000 differ
=== modified file 'slideshows/ubuntukylin/slides/stablekernel.html'
--- slideshows/ubuntukylin/slides/stablekernel.html 2020-03-13 03:02:48 +0000
+++ slideshows/ubuntukylin/slides/stablekernel.html 2020-09-28 07:58:47 +0000
@@ -4,10 +4,10 @@
44
5<h3 style="text-align:center; font-size:34px; margin-top:40px; margin-bottom:30px; font-weight:bold; color:white">Latest Stable Kernel</h3>5<h3 style="text-align:center; font-size:34px; margin-top:40px; margin-bottom:30px; font-weight:bold; color:white">Latest Stable Kernel</h3>
66
7<h3 style="text-align:center; font-size:16px; font-weight:bold; color:white">Linux 5.4 LTS kernel inside, covering latest cutting-edge technologies</h3>7<h3 style="text-align:center; font-size:16px; font-weight:bold; color:white">Linux 5.8 LTS kernel inside, covering latest cutting-edge technologies</h3>
88
9</div>9</div>
1010
11<img class="background" src="screenshots/stablekernel.jpg" />11<img class="background" src="screenshots/stablekernel-2010.jpg" />
1212
13</div>13</div>

Subscribers

People subscribed via source and target branches