Ubiquity Slideshow

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

  1. ubuntukylin-groovy
  2. Merge into html
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
1=== modified file 'po/ubuntukylin/slideshow-ubuntukylin.pot'
2--- po/ubuntukylin/slideshow-ubuntukylin.pot 2020-03-13 03:51:57 +0000
3+++ po/ubuntukylin/slideshow-ubuntukylin.pot 2020-09-28 07:58:47 +0000
4@@ -45,8 +45,7 @@
5 #. type: Content of: <div><div><h3>
6 #: slideshows/ubuntukylin/slides/hardware.html:5
7 msgid ""
8-"Supporting mainstream hardware platforms including Intel, AMD, Kunpeng and "
9-"Phytium"
10+"Supporting mainstream hardware platforms including Intel, AMD, ARM"
11 msgstr ""
12
13 #. type: Content of: <div><div><div><h1>
14@@ -161,7 +160,7 @@
15
16 #. type: Content of: <div><div><h3>
17 #: slideshows/ubuntukylin/slides/stablekernel.html:7
18-msgid "Linux 5.4 LTS kernel inside, covering latest cutting-edge technologies"
19+msgid "Linux 5.8 LTS kernel inside, covering latest cutting-edge technologies"
20 msgstr ""
21
22 #. type: Content of: <div><div><h3>
23
24=== modified file 'slideshows/ubuntukylin/slides/hardware.html'
25--- slideshows/ubuntukylin/slides/hardware.html 2020-03-11 10:09:10 +0000
26+++ slideshows/ubuntukylin/slides/hardware.html 2020-09-28 07:58:47 +0000
27@@ -2,7 +2,7 @@
28 <div class="text">
29
30 <h3 style="text-align:center; font-size:34px; margin-top:40px; margin-bottom:30px; font-weight:bold; color:white">Mainstream Hardware Platforms</h3>
31-<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>
32+<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>
33
34 </div>
35
36
37=== modified file 'slideshows/ubuntukylin/slides/index.html'
38--- slideshows/ubuntukylin/slides/index.html 2020-03-11 10:09:10 +0000
39+++ slideshows/ubuntukylin/slides/index.html 2020-09-28 07:58:47 +0000
40@@ -35,7 +35,6 @@
41 <div><a href="panel.html"></a></div>
42 <div><a href="control-center.html"></a></div>
43 <div><a href="rich-applications.html"></a></div>
44- <div><a href="long-support.html"></a></div>
45 </div>
46
47 <div id="controls">
48
49=== added file 'slideshows/ubuntukylin/slides/screenshots/stablekernel-2010.jpg'
50Binary 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
51=== modified file 'slideshows/ubuntukylin/slides/stablekernel.html'
52--- slideshows/ubuntukylin/slides/stablekernel.html 2020-03-13 03:02:48 +0000
53+++ slideshows/ubuntukylin/slides/stablekernel.html 2020-09-28 07:58:47 +0000
54@@ -4,10 +4,10 @@
55
56 <h3 style="text-align:center; font-size:34px; margin-top:40px; margin-bottom:30px; font-weight:bold; color:white">Latest Stable Kernel</h3>
57
58-<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>
59+<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>
60
61 </div>
62
63-<img class="background" src="screenshots/stablekernel.jpg" />
64+<img class="background" src="screenshots/stablekernel-2010.jpg" />
65
66 </div>

Subscribers

People subscribed via source and target branches