← Back to team overview

ubiquity-slideshow team mailing list archive

[Merge] lp:~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-15.10 into lp:ubiquity-slideshow-ubuntu

 

ShuiLu Pi has proposed merging lp:~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-15.10 into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Ubiquity Slideshow (ubiquity-slideshow)

For more details, see:
https://code.launchpad.net/~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-15.10/+merge/271596
-- 
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~pishuilu1128/ubiquity-slideshow-ubuntu/ubuntukylin-15.10 into lp:ubiquity-slideshow-ubuntu.
=== modified file 'po/ubuntukylin/slideshow-ubuntukylin.pot'
--- po/ubuntukylin/slideshow-ubuntukylin.pot	2015-09-07 07:52:30 +0000
+++ po/ubuntukylin/slideshow-ubuntukylin.pot	2015-09-18 06:32:05 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-07 10:52+0300\n"
+"POT-Creation-Date: 2015-09-18 11:12+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -158,7 +158,7 @@
 
 #. type: Content of: <div><h1>
 #: slideshows/ubuntukylin/slides/welcome.html:1
-msgid "Welcome to Ubuntu Kylin 15.04"
+msgid "Welcome to Ubuntu Kylin 15.10"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
@@ -167,7 +167,7 @@
 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
 "tailor an open source desktop operating system with distinct Chinese "
 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
-"user experience.This release version is 15.04."
+"user experience.This release version is 15.10."
 msgstr ""
 
 #. type: Content of: <div><div><div><p>

=== modified file 'po/ubuntukylin/zh_CN.po'
--- po/ubuntukylin/zh_CN.po	2015-03-31 23:45:03 +0000
+++ po/ubuntukylin/zh_CN.po	2015-09-18 06:32:05 +0000
@@ -116,7 +116,7 @@
 "with Windows, Mac version. You are welcome to install it via Ubuntu Kylin "
 "Software Center or <a href=\"http://www.ubuntukylin.com/\";>www.ubuntukylin."
 "com</a>."
-msgstr "由 Ubuntu Kylin 团队与搜狗公司联合倾力打造,基于小企鹅输入法框架,具备与 Windows、Mac 版本完全一致的用户体验,让您的中文输入键字如飞!可通过软件中心或<a href=\"http://www.ubuntukylin.com/\";> www.ubuntukylin.com </a>安装使用。"
+msgstr "由 Ubuntu Kylin 团队与搜狗公司联合倾力打造,基于小企鹅输入法框架,具备与 Windows、Mac 版本完全一致的用户体验。新增双拼,让您的中文输入键字如飞,一键十行!可通过软件中心或<a href=\"http://www.ubuntukylin.com/\";> www.ubuntukylin.com </a>安装使用。"
 
 #. type: Content of: <div><div><div><h2>
 #: slideshows/ubuntukylin/slides/sogou.html:12
@@ -158,7 +158,7 @@
 
 #. type: Content of: <div><h1>
 #: slideshows/ubuntukylin/slides/welcome.html:1
-msgid "Welcome to Ubuntu Kylin 15.04"
+msgid "Welcome to Ubuntu Kylin 15.10"
 msgstr "欢迎"
 
 #. type: Content of: <div><div><div><p>
@@ -167,8 +167,8 @@
 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
 "tailor an open source desktop operating system with distinct Chinese "
 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
-"user experience.This release version is 15.04."
-msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版,致力于创建更有中国味的开源桌面终端操作系统,为您提供体贴、细腻的用户体验,本次发布的版本为15.04。"
+"user experience.This release version is 15.10."
+msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版,致力于创建更有中国味的开源桌面终端操作系统,为您提供体贴、细腻的用户体验,本次发布的版本为15.10。"
 
 #. type: Content of: <div><div><div><p>
 #: slideshows/ubuntukylin/slides/welcome.html:9

=== modified file 'po/ubuntukylin/zh_HK.po'
--- po/ubuntukylin/zh_HK.po	2015-03-31 23:45:03 +0000
+++ po/ubuntukylin/zh_HK.po	2015-09-18 06:32:05 +0000
@@ -116,7 +116,7 @@
 "with Windows, Mac version. You are welcome to install it via Ubuntu Kylin "
 "Software Center or <a href=\"http://www.ubuntukylin.com/\";>www.ubuntukylin."
 "com</a>."
-msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造,基于小企鵝輸入法框架,具備與 Windows、Mac 版本完全一致的用戶體驗,讓您的中文輸入鍵字如飛!可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\";> www.ubuntukylin.com </a>安裝使用。"
+msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造,基于小企鵝輸入法框架,具備與 Windows、Mac 版本完全一致的用戶體驗。新增雙拼,讓您的中文輸入鍵字如飛,壹鍵十行!可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\";> www.ubuntukylin.com </a>安裝使用。"
 
 #. type: Content of: <div><div><div><h2>
 #: slideshows/ubuntukylin/slides/sogou.html:12
@@ -158,7 +158,7 @@
 
 #. type: Content of: <div><h1>
 #: slideshows/ubuntukylin/slides/welcome.html:1
-msgid "Welcome to Ubuntu Kylin 15.04"
+msgid "Welcome to Ubuntu Kylin 15.10"
 msgstr "歡迎"
 
 #. type: Content of: <div><div><div><p>
@@ -167,8 +167,8 @@
 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
 "tailor an open source desktop operating system with distinct Chinese "
 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
-"user experience.This release version is 15.04."
-msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版,致力于創建更有中國味的開源桌面終端操作系統,爲您提供體貼、細膩的用戶體驗,本次發布的版本爲15.04。"
+"user experience.This release version is 15.10."
+msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版,致力于創建更有中國味的開源桌面終端操作系統,爲您提供體貼、細膩的用戶體驗,本次發布的版本爲15.10。"
 
 #. type: Content of: <div><div><div><p>
 #: slideshows/ubuntukylin/slides/welcome.html:9

=== modified file 'po/ubuntukylin/zh_TW.po'
--- po/ubuntukylin/zh_TW.po	2015-03-31 23:45:03 +0000
+++ po/ubuntukylin/zh_TW.po	2015-09-18 06:32:05 +0000
@@ -116,7 +116,7 @@
 "with Windows, Mac version. You are welcome to install it via Ubuntu Kylin "
 "Software Center or <a href=\"http://www.ubuntukylin.com/\";>www.ubuntukylin."
 "com</a>."
-msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造,基于小企鵝輸入法框架,具備與 Windows、Mac 版本完全一致的用戶體驗,讓您的中文輸入鍵字如飛!可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\";> www.ubuntukylin.com </a>安裝使用。"
+msgstr "由 Ubuntu Kylin 團隊與搜狗公司聯合傾力打造,基于小企鵝輸入法框架,具備與 Windows、Mac 版本完全一致的用戶體驗。新增雙拼,讓您的中文輸入鍵字如飛,壹鍵十行!可通過軟件中心或<a href=\"http://www.ubuntukylin.com/\";> www.ubuntukylin.com </a>安裝使用。"
 
 #. type: Content of: <div><div><div><h2>
 #: slideshows/ubuntukylin/slides/sogou.html:12
@@ -158,7 +158,7 @@
 
 #. type: Content of: <div><h1>
 #: slideshows/ubuntukylin/slides/welcome.html:1
-msgid "Welcome to Ubuntu Kylin 15.04"
+msgid "Welcome to Ubuntu Kylin 15.10"
 msgstr "歡迎"
 
 #. type: Content of: <div><div><div><p>
@@ -167,8 +167,8 @@
 "Ubuntu Kylin is an official flavor of Ubuntu, specifically endeavored to "
 "tailor an open source desktop operating system with distinct Chinese "
 "characteristics, so as to allow its users to enjoy a thoughtful and fine "
-"user experience.This release version is 15.04."
-msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版,致力于創建更有中國味的開源桌面終端操作系統,爲您提供體貼、細膩的用戶體驗,本次發布的版本爲15.04。"
+"user experience.This release version is 15.10."
+msgstr "Ubuntu Kylin 是 Ubuntu 官方中文衍生版,致力于創建更有中國味的開源桌面終端操作系統,爲您提供體貼、細膩的用戶體驗,本次發布的版本爲15.10。"
 
 #. type: Content of: <div><div><div><p>
 #: slideshows/ubuntukylin/slides/welcome.html:9

=== modified file 'slideshows/ubuntukylin/slides/screenshots/sogou.jpg'
Binary files slideshows/ubuntukylin/slides/screenshots/sogou.jpg	2015-04-01 00:01:34 +0000 and slideshows/ubuntukylin/slides/screenshots/sogou.jpg	2015-09-18 06:32:05 +0000 differ
=== modified file 'slideshows/ubuntukylin/slides/screenshots/theme.jpg'
Binary files slideshows/ubuntukylin/slides/screenshots/theme.jpg	2015-04-15 01:53:36 +0000 and slideshows/ubuntukylin/slides/screenshots/theme.jpg	2015-09-18 06:32:05 +0000 differ
=== modified file 'slideshows/ubuntukylin/slides/screenshots/welcome.jpg'
Binary files slideshows/ubuntukylin/slides/screenshots/welcome.jpg	2015-04-09 11:35:16 +0000 and slideshows/ubuntukylin/slides/screenshots/welcome.jpg	2015-09-18 06:32:05 +0000 differ

Follow ups