Ubiquity Slideshow

Merge lp:~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-1610 into lp:ubiquity-slideshow-ubuntu

  1. ubuntukylin-1610
  2. Merge into html
Proposed by ShuiLu Pi
Status: Merged
Merged at revision: 753
Proposed branch: lp:~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-1610
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 364 lines (+42/-42)
13 files modified
po/ubuntukylin/bn.po (+2/-2)
po/ubuntukylin/da.po (+4/-4)
po/ubuntukylin/en_GB.po (+4/-4)
po/ubuntukylin/es.po (+2/-2)
po/ubuntukylin/fr.po (+4/-4)
po/ubuntukylin/nb.po (+4/-4)
po/ubuntukylin/oc.po (+2/-2)
po/ubuntukylin/ru.po (+3/-3)
po/ubuntukylin/slideshow-ubuntukylin.pot (+2/-2)
po/ubuntukylin/uk.po (+3/-3)
po/ubuntukylin/zh_CN.po (+4/-4)
po/ubuntukylin/zh_HK.po (+4/-4)
po/ubuntukylin/zh_TW.po (+4/-4)
To merge this branch: bzr merge lp:~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-1610
Reviewer Review Type Date Requested Status
Aron Xu Approve
Review via email: mp+308000@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Aron Xu (happyaron) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/ubuntukylin/bn.po'
2--- po/ubuntukylin/bn.po 2016-04-12 19:57:15 +0000
3+++ po/ubuntukylin/bn.po 2016-10-09 06:01:36 +0000
4@@ -160,7 +160,7 @@
5
6 #. type: Content of: <div><h1>
7 #: slideshows/ubuntukylin/slides/welcome.html:1
8-msgid "Welcome to Ubuntu Kylin 16.04"
9+msgid "Welcome to Ubuntu Kylin 16.10"
10 msgstr ""
11
12 #. type: Content of: <div><div><div><p>
13@@ -169,7 +169,7 @@
14 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
15 "tailor an open source desktop operating system with distinct Chinese "
16 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
17-"user experience. This release version is 16.04."
18+"user experience. This release version is 16.10."
19 msgstr ""
20
21 #. type: Content of: <div><div><div><p>
22
23=== modified file 'po/ubuntukylin/da.po'
24--- po/ubuntukylin/da.po 2016-04-12 19:57:15 +0000
25+++ po/ubuntukylin/da.po 2016-10-09 06:01:36 +0000
26@@ -189,8 +189,8 @@
27
28 #. type: Content of: <div><h1>
29 #: slideshows/ubuntukylin/slides/welcome.html:1
30-msgid "Welcome to Ubuntu Kylin 16.04"
31-msgstr "Velkommen til Ubuntu Kylin 16.04"
32+msgid "Welcome to Ubuntu Kylin 16.10"
33+msgstr "Velkommen til Ubuntu Kylin 16.10"
34
35 #. type: Content of: <div><div><div><p>
36 #: slideshows/ubuntukylin/slides/welcome.html:8
37@@ -198,12 +198,12 @@
38 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
39 "tailor an open source desktop operating system with distinct Chinese "
40 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
41-"user experience. This release version is 16.04."
42+"user experience. This release version is 16.10."
43 msgstr ""
44 "Ubuntu Kylin er en officiel variant af Ubuntu, der er et skræddersyet open "
45 "source-operativsystem, der har en særlig kinesisk karakteristik, der giver "
46 "brugerne mulighed for at få en hensynsfuld og fin brugeroplevelse. Denne "
47-"udgivelse er version 16.04."
48+"udgivelse er version 16.10."
49
50 #. type: Content of: <div><div><div><p>
51 #: slideshows/ubuntukylin/slides/welcome.html:9
52
53=== modified file 'po/ubuntukylin/en_GB.po'
54--- po/ubuntukylin/en_GB.po 2016-04-12 19:57:15 +0000
55+++ po/ubuntukylin/en_GB.po 2016-10-09 06:01:36 +0000
56@@ -186,8 +186,8 @@
57
58 #. type: Content of: <div><h1>
59 #: slideshows/ubuntukylin/slides/welcome.html:1
60-msgid "Welcome to Ubuntu Kylin 16.04"
61-msgstr "Welcome to Ubuntu Kylin 16.04"
62+msgid "Welcome to Ubuntu Kylin 16.10"
63+msgstr "Welcome to Ubuntu Kylin 16.10"
64
65 #. type: Content of: <div><div><div><p>
66 #: slideshows/ubuntukylin/slides/welcome.html:8
67@@ -195,12 +195,12 @@
68 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
69 "tailor an open source desktop operating system with distinct Chinese "
70 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
71-"user experience. This release version is 16.04."
72+"user experience. This release version is 16.10."
73 msgstr ""
74 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
75 "tailor an open source desktop operating system with distinct Chinese "
76 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
77-"user experience. This release version is 16.04."
78+"user experience. This release version is 16.10."
79
80 #. type: Content of: <div><div><div><p>
81 #: slideshows/ubuntukylin/slides/welcome.html:9
82
83=== modified file 'po/ubuntukylin/es.po'
84--- po/ubuntukylin/es.po 2016-04-12 19:57:15 +0000
85+++ po/ubuntukylin/es.po 2016-10-09 06:01:36 +0000
86@@ -160,7 +160,7 @@
87
88 #. type: Content of: <div><h1>
89 #: slideshows/ubuntukylin/slides/welcome.html:1
90-msgid "Welcome to Ubuntu Kylin 16.04"
91+msgid "Welcome to Ubuntu Kylin 16.10"
92 msgstr ""
93
94 #. type: Content of: <div><div><div><p>
95@@ -169,7 +169,7 @@
96 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
97 "tailor an open source desktop operating system with distinct Chinese "
98 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
99-"user experience. This release version is 16.04."
100+"user experience. This release version is 16.10."
101 msgstr ""
102
103 #. type: Content of: <div><div><div><p>
104
105=== modified file 'po/ubuntukylin/fr.po'
106--- po/ubuntukylin/fr.po 2016-04-12 19:57:15 +0000
107+++ po/ubuntukylin/fr.po 2016-10-09 06:01:36 +0000
108@@ -188,8 +188,8 @@
109
110 #. type: Content of: <div><h1>
111 #: slideshows/ubuntukylin/slides/welcome.html:1
112-msgid "Welcome to Ubuntu Kylin 16.04"
113-msgstr "Bienvenue dans Ubuntu Kylin 16.04"
114+msgid "Welcome to Ubuntu Kylin 16.10"
115+msgstr "Bienvenue dans Ubuntu Kylin 16.10"
116
117 #. type: Content of: <div><div><div><p>
118 #: slideshows/ubuntukylin/slides/welcome.html:8
119@@ -197,13 +197,13 @@
120 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
121 "tailor an open source desktop operating system with distinct Chinese "
122 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
123-"user experience. This release version is 16.04."
124+"user experience. This release version is 16.10."
125 msgstr ""
126 "Ubuntu Kylin est une variante officielle d'Ubuntu, spécifiquement adaptée à "
127 "un système d'exploitation de bureau open source avec des caractéristiques "
128 "distinctes pour le chinois, de manière à permettre à ses utilisateurs de "
129 "profiter d'une expérience utilisateur réfléchie et fine. Cette version est "
130-"la 16.04."
131+"la 16.10."
132
133 #. type: Content of: <div><div><div><p>
134 #: slideshows/ubuntukylin/slides/welcome.html:9
135
136=== modified file 'po/ubuntukylin/nb.po'
137--- po/ubuntukylin/nb.po 2016-04-12 19:57:15 +0000
138+++ po/ubuntukylin/nb.po 2016-10-09 06:01:36 +0000
139@@ -187,8 +187,8 @@
140
141 #. type: Content of: <div><h1>
142 #: slideshows/ubuntukylin/slides/welcome.html:1
143-msgid "Welcome to Ubuntu Kylin 16.04"
144-msgstr "Velkommen til Ubuntu Kylin 16.04"
145+msgid "Welcome to Ubuntu Kylin 16.10"
146+msgstr "Velkommen til Ubuntu Kylin 16.10"
147
148 #. type: Content of: <div><div><div><p>
149 #: slideshows/ubuntukylin/slides/welcome.html:8
150@@ -196,12 +196,12 @@
151 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
152 "tailor an open source desktop operating system with distinct Chinese "
153 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
154-"user experience. This release version is 16.04."
155+"user experience. This release version is 16.10."
156 msgstr ""
157 "Ubuntu Kylin er en offisiell variant av Ubuntu som prøver å tilpasse et "
158 "fritt skrivebordssystem spesielt for kinesisk lesemetode, slik at også "
159 "brukere av kinesisk kan få et brukervennlig system. Denne utgivelsen er "
160-"versjon 16.04."
161+"versjon 16.10."
162
163 #. type: Content of: <div><div><div><p>
164 #: slideshows/ubuntukylin/slides/welcome.html:9
165
166=== modified file 'po/ubuntukylin/oc.po'
167--- po/ubuntukylin/oc.po 2016-04-12 19:57:15 +0000
168+++ po/ubuntukylin/oc.po 2016-10-09 06:01:36 +0000
169@@ -160,7 +160,7 @@
170
171 #. type: Content of: <div><h1>
172 #: slideshows/ubuntukylin/slides/welcome.html:1
173-msgid "Welcome to Ubuntu Kylin 16.04"
174+msgid "Welcome to Ubuntu Kylin 16.10"
175 msgstr ""
176
177 #. type: Content of: <div><div><div><p>
178@@ -169,7 +169,7 @@
179 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
180 "tailor an open source desktop operating system with distinct Chinese "
181 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
182-"user experience. This release version is 16.04."
183+"user experience. This release version is 16.10."
184 msgstr ""
185
186 #. type: Content of: <div><div><div><p>
187
188=== modified file 'po/ubuntukylin/ru.po'
189--- po/ubuntukylin/ru.po 2016-04-12 19:57:15 +0000
190+++ po/ubuntukylin/ru.po 2016-10-09 06:01:36 +0000
191@@ -185,8 +185,8 @@
192
193 #. type: Content of: <div><h1>
194 #: slideshows/ubuntukylin/slides/welcome.html:1
195-msgid "Welcome to Ubuntu Kylin 16.04"
196-msgstr "Добро пожаловать в Ubuntu Kylin 16.04"
197+msgid "Welcome to Ubuntu Kylin 16.10"
198+msgstr "Добро пожаловать в Ubuntu Kylin 16.10"
199
200 #. type: Content of: <div><div><div><p>
201 #: slideshows/ubuntukylin/slides/welcome.html:8
202@@ -194,7 +194,7 @@
203 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
204 "tailor an open source desktop operating system with distinct Chinese "
205 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
206-"user experience. This release version is 16.04."
207+"user experience. This release version is 16.10."
208 msgstr ""
209
210 #. type: Content of: <div><div><div><p>
211
212=== modified file 'po/ubuntukylin/slideshow-ubuntukylin.pot'
213--- po/ubuntukylin/slideshow-ubuntukylin.pot 2016-04-14 12:10:34 +0000
214+++ po/ubuntukylin/slideshow-ubuntukylin.pot 2016-10-09 06:01:36 +0000
215@@ -163,7 +163,7 @@
216
217 #. type: Content of: <div><h1>
218 #: slideshows/ubuntukylin/slides/welcome.html:1
219-msgid "Welcome to Ubuntu Kylin 16.04"
220+msgid "Welcome to Ubuntu Kylin 16.10"
221 msgstr ""
222
223 #. type: Content of: <div><div><div><p>
224@@ -172,7 +172,7 @@
225 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
226 "tailor an open source desktop operating system with distinct Chinese "
227 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
228-"user experience. This release version is 16.04."
229+"user experience. This release version is 16.10."
230 msgstr ""
231
232 #. type: Content of: <div><div><div><p>
233
234=== modified file 'po/ubuntukylin/uk.po'
235--- po/ubuntukylin/uk.po 2016-04-12 19:57:15 +0000
236+++ po/ubuntukylin/uk.po 2016-10-09 06:01:36 +0000
237@@ -184,8 +184,8 @@
238
239 #. type: Content of: <div><h1>
240 #: slideshows/ubuntukylin/slides/welcome.html:1
241-msgid "Welcome to Ubuntu Kylin 16.04"
242-msgstr "Вітаємо в Ubuntu Kylin 16.04"
243+msgid "Welcome to Ubuntu Kylin 16.10"
244+msgstr "Вітаємо в Ubuntu Kylin 16.10"
245
246 #. type: Content of: <div><div><div><p>
247 #: slideshows/ubuntukylin/slides/welcome.html:8
248@@ -193,7 +193,7 @@
249 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
250 "tailor an open source desktop operating system with distinct Chinese "
251 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
252-"user experience. This release version is 16.04."
253+"user experience. This release version is 16.10."
254 msgstr ""
255
256 #. type: Content of: <div><div><div><p>
257
258=== modified file 'po/ubuntukylin/zh_CN.po'
259--- po/ubuntukylin/zh_CN.po 2016-04-14 12:28:57 +0000
260+++ po/ubuntukylin/zh_CN.po 2016-10-09 06:01:36 +0000
261@@ -98,7 +98,7 @@
262 "with Windows, Mac version. You are welcome to install it via Ubuntu Kylin "
263 "Software Center or <a href=\"http://www.ubuntukylin.com/\">www.ubuntukylin."
264 "com</a>."
265-msgstr "由 Ubuntu Kylin 团队与搜狗公司联合倾力打造，基于小企鹅输入法框架，具备与 Windows、Mac 版本完全一致的用户体验。新增双拼，让您的中文输入键字如飞，一键十行！可通过软件中心或<a href=\"http://www.ubuntukylin.com/\"> www.ubuntukylin.com </a>安装使用。"
266+msgstr "由 Ubuntu Kylin 团队与搜狗公司联合倾力打造，基于小企鹅输入法框架，具备与 Windows、Mac 版本完全一致的用户体验。更新2016内核、完美支持U模式，让您叠字拆字更随心，享受极致输入体验！可通过软件中心或<a href=\"http://www.ubuntukylin.com/\"> www.ubuntukylin.com </a>安装使用。"
267
268 #. type: Content of: <div><div><div><h2>
269 #: slideshows/ubuntukylin/slides/sogou.html:12
270@@ -166,7 +166,7 @@
271
272 #. type: Content of: <div><h1>
273 #: slideshows/ubuntukylin/slides/welcome.html:1
274-msgid "Welcome to Ubuntu Kylin 16.04"
275+msgid "Welcome to Ubuntu Kylin 16.10"
276 msgstr "欢迎"
277
278 #. type: Content of: <div><div><div><p>
279@@ -175,8 +175,8 @@
280 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
281 "tailor an open source desktop operating system with distinct Chinese "
282 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
283-"user experience. This release version is 16.04."
284-msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版，致力于创建更有中国味的开源桌面终端操作系统，为您提供体贴、细腻的用户体验，本次发布的版本为16.04。"
285+"user experience. This release version is 16.10."
286+msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版，致力于创建更有中国味的开源桌面终端操作系统，为您提供体贴、细腻的用户体验，本次发布的版本为16.10。"
287
288 #. type: Content of: <div><div><div><p>
289 #: slideshows/ubuntukylin/slides/welcome.html:9
290
291=== modified file 'po/ubuntukylin/zh_HK.po'
292--- po/ubuntukylin/zh_HK.po 2016-04-14 12:10:34 +0000
293+++ po/ubuntukylin/zh_HK.po 2016-10-09 06:01:36 +0000
294@@ -95,7 +95,7 @@
295 "with Windows, Mac version. You are welcome to install it via Ubuntu Kylin "
296 "Software Center or <a href=\"http://www.ubuntukylin.com/\">www.ubuntukylin."
297 "com</a>."
298-msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造，基于小企鵝輸入法框架，具備與 Windows、Mac 版本完全一致的用戶體驗。新增雙拼，讓您的中文輸入鍵字如飛，壹鍵十行！可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\"> www.ubuntukylin.com </a>安裝使用。"
299+msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造，基于小企鵝輸入法框架，具備與 Windows、Mac 版本完全一致的用戶體驗。更新2016內核、完美支持U模式，讓您疊字拆字更隨心，享受極致輸入體驗！可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\"> www.ubuntukylin.com </a>安裝使用。"
300
301 #. type: Content of: <div><div><div><h2>
302 #: slideshows/ubuntukylin/slides/sogou.html:12
303@@ -163,7 +163,7 @@
304
305 #. type: Content of: <div><h1>
306 #: slideshows/ubuntukylin/slides/welcome.html:1
307-msgid "Welcome to Ubuntu Kylin 16.04"
308+msgid "Welcome to Ubuntu Kylin 16.10"
309 msgstr "歡迎"
310
311 #. type: Content of: <div><div><div><p>
312@@ -172,8 +172,8 @@
313 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
314 "tailor an open source desktop operating system with distinct Chinese "
315 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
316-"user experience. This release version is 16.04."
317-msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版，致力于創建更有中國味的開源桌面終端操作系統，爲您提供體貼、細膩的用戶體驗，本次發布的版本爲16.04。"
318+"user experience. This release version is 16.10."
319+msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版，致力于創建更有中國味的開源桌面終端操作系統，爲您提供體貼、細膩的用戶體驗，本次發布的版本爲16.10。"
320
321 #. type: Content of: <div><div><div><p>
322 #: slideshows/ubuntukylin/slides/welcome.html:9
323
324=== modified file 'po/ubuntukylin/zh_TW.po'
325--- po/ubuntukylin/zh_TW.po 2016-04-14 12:10:34 +0000
326+++ po/ubuntukylin/zh_TW.po 2016-10-09 06:01:36 +0000
327@@ -95,7 +95,7 @@
328 "with Windows, Mac version. You are welcome to install it via Ubuntu Kylin "
329 "Software Center or <a href=\"http://www.ubuntukylin.com/\">www.ubuntukylin."
330 "com</a>."
331-msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造，基于小企鵝輸入法框架，具備與 Windows、Mac 版本完全一致的用戶體驗。新增雙拼，讓您的中文輸入鍵字如飛，壹鍵十行！可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\"> www.ubuntukylin.com </a>安裝使用。"
332+msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造，基于小企鵝輸入法框架，具備與 Windows、Mac 版本完全一致的用戶體驗。更新2016內核、完美支持U模式，讓您疊字拆字更隨心，享受極致輸入體驗！可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\"> www.ubuntukylin.com </a>安裝使用。"
333
334 #. type: Content of: <div><div><div><h2>
335 #: slideshows/ubuntukylin/slides/sogou.html:12
336@@ -163,7 +163,7 @@
337
338 #. type: Content of: <div><h1>
339 #: slideshows/ubuntukylin/slides/welcome.html:1
340-msgid "Welcome to Ubuntu Kylin 16.04"
341+msgid "Welcome to Ubuntu Kylin 16.10"
342 msgstr "歡迎"
343
344 #. type: Content of: <div><div><div><p>
345@@ -172,8 +172,8 @@
346 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
347 "tailor an open source desktop operating system with distinct Chinese "
348 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
349-"user experience. This release version is 16.04."
350-msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版，致力于創建更有中國味的開源桌面終端操作系統，爲您提供體貼、細膩的用戶體驗，本次發布的版本爲16.04。"
351+"user experience. This release version is 16.10."
352+msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版，致力于創建更有中國味的開源桌面終端操作系統，爲您提供體貼、細膩的用戶體驗，本次發布的版本爲16.10。"
353
354 #. type: Content of: <div><div><div><p>
355 #: slideshows/ubuntukylin/slides/welcome.html:9
356
357=== modified file 'slideshows/ubuntukylin/slides/screenshots/community.jpg'
358Binary files slideshows/ubuntukylin/slides/screenshots/community.jpg 2016-04-14 12:10:34 +0000 and slideshows/ubuntukylin/slides/screenshots/community.jpg 2016-10-09 06:01:36 +0000 differ
359=== modified file 'slideshows/ubuntukylin/slides/screenshots/theme.jpg'
360Binary files slideshows/ubuntukylin/slides/screenshots/theme.jpg 2016-04-14 12:10:34 +0000 and slideshows/ubuntukylin/slides/screenshots/theme.jpg 2016-10-09 06:01:36 +0000 differ
361=== modified file 'slideshows/ubuntukylin/slides/screenshots/ukunity.jpg'
362Binary files slideshows/ubuntukylin/slides/screenshots/ukunity.jpg 2016-04-14 12:10:34 +0000 and slideshows/ubuntukylin/slides/screenshots/ukunity.jpg 2016-10-09 06:01:36 +0000 differ
363=== modified file 'slideshows/ubuntukylin/slides/screenshots/welcome.jpg'
364Binary files slideshows/ubuntukylin/slides/screenshots/welcome.jpg 2016-04-14 12:10:34 +0000 and slideshows/ubuntukylin/slides/screenshots/welcome.jpg 2016-10-09 06:01:36 +0000 differ

Subscribers

People subscribed via source and target branches