Ubiquity Slideshow

Merge lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu into lp:ubiquity-slideshow-ubuntu

  1. ubiquity-slideshow-ubuntu
  2. Merge into html
Proposed by Will Cooke on 2016-03-23
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2016-03-25
Approved revision: no longer in the source branch.
Merged at revision: 737
Proposed branch: lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 287 lines (+14/-105)
13 files modified
po/edubuntu/slideshow-edubuntu.pot (+1/-1)
po/kubuntu/slideshow-kubuntu.pot (+1/-1)
po/lubuntu/slideshow-lubuntu.pot (+1/-1)
po/oem-config-ubuntu-mate/slideshow-oem-config-ubuntu-mate.pot (+1/-1)
po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot (+1/-1)
po/ubuntu-gnome/slideshow-ubuntu-gnome.pot (+2/-93)
po/ubuntu-mate/slideshow-ubuntu-mate.pot (+1/-1)
po/ubuntu/slideshow-ubuntu.pot (+1/-1)
po/ubuntukylin/slideshow-ubuntukylin.pot (+1/-1)
po/ubuntustudio/slideshow-ubuntustudio.pot (+1/-1)
po/xubuntu/slideshow-xubuntu.pot (+1/-1)
slideshows/oem-config-ubuntu/slides/welcome.html (+1/-1)
slideshows/ubuntu/slides/usc.html (+1/-1)
To merge this branch: bzr merge lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2016-03-23 Approve on 2016-03-25
Review via email: mp+289974@code.launchpad.net

Commit Message

Fixxed OEM symlinks.
Updated Software screenshot to match the others.
Update usc.html to point to the new screenshot.

Description of the Change

Fixxed OEM symlinks.
Updated Software screenshot to match the others.
Update usc.html to point to the new screenshot.

To post a comment you must log in.
lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu updated on 2016-03-24
735. By Pasi Lallinaho on 2016-03-24

Make sure certain strings in the Xubuntu slideshow aren't translated as they aren't supposed to be.
Update translation templates.
Fix formatting on the Xubuntu applications slide.

Mathieu Trudel-Lapierre (cyphermox) wrote :

Will check and adjust at merge time, but it looks fine.

review: Approve
lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu updated on 2016-03-25
736. By Mathieu Trudel-Lapierre on 2016-03-25

* Update translations
* Fix formatting and translatability on Xubuntu slides.
* Ditched tiny.cc links on ubuntu-gnome gethelp slide; replaced with
  the real links.

737. By Mathieu Trudel-Lapierre on 2016-03-25

* Fixed OEM symlinks so the OEM configuration slideshow will display
  properly.
* Updated Software screenshot to match the others.
* Updated usc.html to point to the new screenshot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/edubuntu/slideshow-edubuntu.pot'
2--- po/edubuntu/slideshow-edubuntu.pot 2016-03-22 19:51:31 +0000
3+++ po/edubuntu/slideshow-edubuntu.pot 2016-03-23 20:53:26 +0000
4@@ -7,7 +7,7 @@
5 msgid ""
6 msgstr ""
7 "Project-Id-Version: PACKAGE VERSION\n"
8-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
9+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13
14=== modified file 'po/kubuntu/slideshow-kubuntu.pot'
15--- po/kubuntu/slideshow-kubuntu.pot 2016-03-22 19:51:31 +0000
16+++ po/kubuntu/slideshow-kubuntu.pot 2016-03-23 20:53:26 +0000
17@@ -7,7 +7,7 @@
18 msgid ""
19 msgstr ""
20 "Project-Id-Version: PACKAGE VERSION\n"
21-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
22+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26
27=== modified file 'po/lubuntu/slideshow-lubuntu.pot'
28--- po/lubuntu/slideshow-lubuntu.pot 2016-03-22 19:51:31 +0000
29+++ po/lubuntu/slideshow-lubuntu.pot 2016-03-23 20:53:26 +0000
30@@ -7,7 +7,7 @@
31 msgid ""
32 msgstr ""
33 "Project-Id-Version: PACKAGE VERSION\n"
34-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
35+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
36 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
37 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
38 "Language-Team: LANGUAGE <LL@li.org>\n"
39
40=== modified file 'po/oem-config-ubuntu-mate/slideshow-oem-config-ubuntu-mate.pot'
41--- po/oem-config-ubuntu-mate/slideshow-oem-config-ubuntu-mate.pot 2016-03-22 19:51:31 +0000
42+++ po/oem-config-ubuntu-mate/slideshow-oem-config-ubuntu-mate.pot 2016-03-23 20:53:26 +0000
43@@ -7,7 +7,7 @@
44 msgid ""
45 msgstr ""
46 "Project-Id-Version: PACKAGE VERSION\n"
47-"POT-Creation-Date: 2016-03-22 19:51+0000\n"
48+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
49 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
50 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
51 "Language-Team: LANGUAGE <LL@li.org>\n"
52
53=== modified file 'po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot'
54--- po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot 2016-03-22 19:51:31 +0000
55+++ po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot 2016-03-23 20:53:26 +0000
56@@ -7,7 +7,7 @@
57 msgid ""
58 msgstr ""
59 "Project-Id-Version: PACKAGE VERSION\n"
60-"POT-Creation-Date: 2016-03-22 19:51+0000\n"
61+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
62 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
63 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
64 "Language-Team: LANGUAGE <LL@li.org>\n"
65
66=== modified file 'po/ubuntu-gnome/slideshow-ubuntu-gnome.pot'
67--- po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2016-03-22 19:51:31 +0000
68+++ po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2016-03-23 20:53:26 +0000
69@@ -6,99 +6,8 @@
70 #, fuzzy
71 msgid ""
72 msgstr ""
73-"#-#-#-#-# accessibility.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
74-"Project-Id-Version: PACKAGE VERSION\n"
75-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
76-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
77-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
78-"Language-Team: LANGUAGE <LL@li.org>\n"
79-"Language: \n"
80-"MIME-Version: 1.0\n"
81-"Content-Type: text/plain; charset=UTF-8\n"
82-"Content-Transfer-Encoding: 8bit\n"
83-"#-#-#-#-# browse.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
84-"Project-Id-Version: PACKAGE VERSION\n"
85-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
86-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
87-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
88-"Language-Team: LANGUAGE <LL@li.org>\n"
89-"Language: \n"
90-"MIME-Version: 1.0\n"
91-"Content-Type: text/plain; charset=UTF-8\n"
92-"Content-Transfer-Encoding: 8bit\n"
93-"#-#-#-#-# desktop.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
94-"Project-Id-Version: PACKAGE VERSION\n"
95-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
96-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
97-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
98-"Language-Team: LANGUAGE <LL@li.org>\n"
99-"Language: \n"
100-"MIME-Version: 1.0\n"
101-"Content-Type: text/plain; charset=UTF-8\n"
102-"Content-Transfer-Encoding: 8bit\n"
103-"#-#-#-#-# gethelp.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
104-"Project-Id-Version: PACKAGE VERSION\n"
105-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
106-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
107-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
108-"Language-Team: LANGUAGE <LL@li.org>\n"
109-"Language: \n"
110-"MIME-Version: 1.0\n"
111-"Content-Type: text/plain; charset=UTF-8\n"
112-"Content-Transfer-Encoding: 8bit\n"
113-"#-#-#-#-# goa.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
114-"Project-Id-Version: PACKAGE VERSION\n"
115-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
116-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
117-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
118-"Language-Team: LANGUAGE <LL@li.org>\n"
119-"Language: \n"
120-"MIME-Version: 1.0\n"
121-"Content-Type: text/plain; charset=UTF-8\n"
122-"Content-Transfer-Encoding: 8bit\n"
123-"#-#-#-#-# media.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
124-"Project-Id-Version: PACKAGE VERSION\n"
125-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
126-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
127-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
128-"Language-Team: LANGUAGE <LL@li.org>\n"
129-"Language: \n"
130-"MIME-Version: 1.0\n"
131-"Content-Type: text/plain; charset=UTF-8\n"
132-"Content-Transfer-Encoding: 8bit\n"
133-"#-#-#-#-# office.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
134-"Project-Id-Version: PACKAGE VERSION\n"
135-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
136-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
137-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
138-"Language-Team: LANGUAGE <LL@li.org>\n"
139-"Language: \n"
140-"MIME-Version: 1.0\n"
141-"Content-Type: text/plain; charset=UTF-8\n"
142-"Content-Transfer-Encoding: 8bit\n"
143-"#-#-#-#-# photos.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
144-"Project-Id-Version: PACKAGE VERSION\n"
145-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
146-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
147-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
148-"Language-Team: LANGUAGE <LL@li.org>\n"
149-"Language: \n"
150-"MIME-Version: 1.0\n"
151-"Content-Type: text/plain; charset=UTF-8\n"
152-"Content-Transfer-Encoding: 8bit\n"
153-"#-#-#-#-# software.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
154-"Project-Id-Version: PACKAGE VERSION\n"
155-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
156-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
157-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
158-"Language-Team: LANGUAGE <LL@li.org>\n"
159-"Language: \n"
160-"MIME-Version: 1.0\n"
161-"Content-Type: text/plain; charset=UTF-8\n"
162-"Content-Transfer-Encoding: 8bit\n"
163-"#-#-#-#-# welcome.html.pot (PACKAGE VERSION) #-#-#-#-#\n"
164-"Project-Id-Version: PACKAGE VERSION\n"
165-"POT-Creation-Date: 2016-03-22 19:51+0000\n"
166+"Project-Id-Version: PACKAGE VERSION\n"
167+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
168 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
169 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
170 "Language-Team: LANGUAGE <LL@li.org>\n"
171
172=== modified file 'po/ubuntu-mate/slideshow-ubuntu-mate.pot'
173--- po/ubuntu-mate/slideshow-ubuntu-mate.pot 2016-03-22 19:51:31 +0000
174+++ po/ubuntu-mate/slideshow-ubuntu-mate.pot 2016-03-23 20:53:26 +0000
175@@ -7,7 +7,7 @@
176 msgid ""
177 msgstr ""
178 "Project-Id-Version: PACKAGE VERSION\n"
179-"POT-Creation-Date: 2016-03-22 19:51+0000\n"
180+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
181 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
182 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
183 "Language-Team: LANGUAGE <LL@li.org>\n"
184
185=== modified file 'po/ubuntu/slideshow-ubuntu.pot'
186--- po/ubuntu/slideshow-ubuntu.pot 2016-03-22 19:51:31 +0000
187+++ po/ubuntu/slideshow-ubuntu.pot 2016-03-23 20:53:26 +0000
188@@ -7,7 +7,7 @@
189 msgid ""
190 msgstr ""
191 "Project-Id-Version: PACKAGE VERSION\n"
192-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
193+"POT-Creation-Date: 2016-03-23 10:39+0000\n"
194 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
195 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
196 "Language-Team: LANGUAGE <LL@li.org>\n"
197
198=== modified file 'po/ubuntukylin/slideshow-ubuntukylin.pot'
199--- po/ubuntukylin/slideshow-ubuntukylin.pot 2016-03-22 19:51:31 +0000
200+++ po/ubuntukylin/slideshow-ubuntukylin.pot 2016-03-23 20:53:26 +0000
201@@ -7,7 +7,7 @@
202 msgid ""
203 msgstr ""
204 "Project-Id-Version: PACKAGE VERSION\n"
205-"POT-Creation-Date: 2016-03-22 19:51+0000\n"
206+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
207 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
208 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
209 "Language-Team: LANGUAGE <LL@li.org>\n"
210
211=== modified file 'po/ubuntustudio/slideshow-ubuntustudio.pot'
212--- po/ubuntustudio/slideshow-ubuntustudio.pot 2016-03-22 19:51:31 +0000
213+++ po/ubuntustudio/slideshow-ubuntustudio.pot 2016-03-23 20:53:26 +0000
214@@ -7,7 +7,7 @@
215 msgid ""
216 msgstr ""
217 "Project-Id-Version: PACKAGE VERSION\n"
218-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
219+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
220 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
221 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
222 "Language-Team: LANGUAGE <LL@li.org>\n"
223
224=== modified file 'po/xubuntu/slideshow-xubuntu.pot'
225--- po/xubuntu/slideshow-xubuntu.pot 2016-03-22 19:51:31 +0000
226+++ po/xubuntu/slideshow-xubuntu.pot 2016-03-23 20:53:26 +0000
227@@ -7,7 +7,7 @@
228 msgid ""
229 msgstr ""
230 "Project-Id-Version: PACKAGE VERSION\n"
231-"POT-Creation-Date: 2016-03-22 19:50+0000\n"
232+"POT-Creation-Date: 2016-03-23 10:40+0000\n"
233 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
234 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
235 "Language-Team: LANGUAGE <LL@li.org>\n"
236
237=== removed symlink 'slideshows/oem-config-ubuntu/slides/screenshots/browse.jpg'
238=== target was u'../../../ubuntu/slides/screenshots/browse.jpg'
239=== added symlink 'slideshows/oem-config-ubuntu/slides/screenshots/browse.png'
240=== target is u'../../../ubuntu/slides/screenshots/browse.png'
241=== removed symlink 'slideshows/oem-config-ubuntu/slides/screenshots/customize.jpg'
242=== target was u'../../../ubuntu/slides/screenshots/customize.jpg'
243=== added symlink 'slideshows/oem-config-ubuntu/slides/screenshots/customize.png'
244=== target is u'../../../ubuntu/slides/screenshots/customize.png'
245=== added symlink 'slideshows/oem-config-ubuntu/slides/screenshots/gs.png'
246=== target is u'../../../ubuntu/slides/screenshots/gs.png'
247=== removed symlink 'slideshows/oem-config-ubuntu/slides/screenshots/office.jpg'
248=== target was u'../../../ubuntu/slides/screenshots/office.jpg'
249=== added symlink 'slideshows/oem-config-ubuntu/slides/screenshots/office.png'
250=== target is u'../../../ubuntu/slides/screenshots/office.png'
251=== removed symlink 'slideshows/oem-config-ubuntu/slides/screenshots/photos.jpg'
252=== target was u'../../../ubuntu/slides/screenshots/photos.jpg'
253=== added symlink 'slideshows/oem-config-ubuntu/slides/screenshots/photos.png'
254=== target is u'../../../ubuntu/slides/screenshots/photos.png'
255=== removed symlink 'slideshows/oem-config-ubuntu/slides/screenshots/usc.jpg'
256=== target was u'../../../ubuntu/slides/screenshots/usc.jpg'
257=== removed symlink 'slideshows/oem-config-ubuntu/slides/screenshots/welcome.jpg'
258=== target was u'../../../ubuntu/slides/screenshots/welcome.jpg'
259=== added symlink 'slideshows/oem-config-ubuntu/slides/screenshots/welcome.png'
260=== target is u'../../../ubuntu/slides/screenshots/welcome.png'
261=== modified file 'slideshows/oem-config-ubuntu/slides/welcome.html'
262--- slideshows/oem-config-ubuntu/slides/welcome.html 2015-04-01 00:01:34 +0000
263+++ slideshows/oem-config-ubuntu/slides/welcome.html 2016-03-23 20:53:26 +0000
264@@ -10,6 +10,6 @@
265
266 </div>
267
268-<img class="background" src="screenshots/welcome.jpg" />
269+<img class="background" src="screenshots/welcome.png" />
270
271 </div>
272
273=== removed file 'slideshows/ubuntu/slides/screenshots/gs.jpg'
274Binary files slideshows/ubuntu/slides/screenshots/gs.jpg 2016-03-22 19:44:10 +0000 and slideshows/ubuntu/slides/screenshots/gs.jpg 1970-01-01 00:00:00 +0000 differ
275=== added file 'slideshows/ubuntu/slides/screenshots/gs.png'
276Binary files slideshows/ubuntu/slides/screenshots/gs.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/screenshots/gs.png 2016-03-23 20:53:26 +0000 differ
277=== modified file 'slideshows/ubuntu/slides/usc.html'
278--- slideshows/ubuntu/slides/usc.html 2016-03-22 19:44:10 +0000
279+++ slideshows/ubuntu/slides/usc.html 2016-03-23 20:53:26 +0000
280@@ -10,6 +10,6 @@
281
282 </div>
283
284-<img class="screenshot" src="screenshots/gs.jpg" />
285+<img class="screenshot" src="screenshots/gs.png" />
286
287 </div>

Subscribers

People subscribed via source and target branches