← Back to team overview

ubuntukylin-members team mailing list archive

[Merge] lp:ubuntukylin-default-settings into lp:ubuntukylin-default-settings/13.10

 

ShuiLu Pi has proposed merging lp:ubuntukylin-default-settings into lp:ubuntukylin-default-settings/13.10.

Requested reviews:
  ShuiLu Pi (pishuilu1128)
Related bugs:
  Bug #1160374 in ubuntukylin-default-settings (Ubuntu): "fix bug when removing packages and upgrade slideshow"
  https://bugs.launchpad.net/ubuntu/+source/ubuntukylin-default-settings/+bug/1160374

For more details, see:
https://code.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk/+merge/194658
-- 
https://code.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk/+merge/194658
Your team Ubuntu Kylin Members is subscribed to branch lp:ubuntukylin-default-settings/13.10.
=== modified file 'debian/20_ubuntukylin-default-settings.gschema.override'
--- debian/20_ubuntukylin-default-settings.gschema.override	2013-04-16 02:37:18 +0000
+++ debian/20_ubuntukylin-default-settings.gschema.override	2013-11-11 07:04:47 +0000
@@ -14,8 +14,5 @@
 [org.gnome.desktop.wm.preferences]
 theme="ubuntukylin-theme"
 
-[com.canonical.unity-greeter]
-background="/usr/share/backgrounds/ubuntukylin-default-settings.jpg"
-
 [com.canonical.Unity.Launcher]
-favorites=['application://ubiquity-gtkui.desktop', 'application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', 'application://ubuntuone-installer.desktop', 'application://ubuntu-amazon-default.desktop', 'application://UbuntuOneMusiconeubuntucom.desktop', 'application://gnome-control-center.desktop', 'unity://desktop-icon', 'unity://running-apps', 'unity://expo-icon', 'unity://devices']
+favorites=['application://ubiquity-gtkui.desktop', 'application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', 'application://youker-assistant.desktop', 'application://gnome-terminal.desktop', 'application://gnome-control-center.desktop', 'unity://desktop-icon', 'unity://running-apps', 'unity://expo-icon', 'unity://devices']

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-17 11:35:16 +0000
+++ debian/changelog	2013-11-11 07:04:47 +0000
@@ -1,6 +1,51 @@
+ubuntukylin-default-settings (1.0.10) saucy; urgency=low
+
+  * Fix build by removing unity.mo from .install
+
+ -- Aron Xu <happyaron.xu@xxxxxxxxx>  Thu, 10 Oct 2013 00:28:17 +0800
+
+ubuntukylin-default-settings (1.0.9) saucy; urgency=low
+
+  * Revert the file overwrite behavior for unity.mo (LP: #1222621)
+
+ -- Aron Xu <happyaron@xxxxxxxxxx>  Wed, 09 Oct 2013 23:42:23 +0800
+
+ubuntukylin-default-settings (1.0.8) saucy; urgency=low
+
+  * Remove unneeded theme-tools.desktop
+  * Revert all system overrides.
+  * Revert changes to /etc/environment
+  * Rewrite historical changelog.
+
+ -- Aron Xu <happyaron@xxxxxxxxxx>  Tue, 24 Sep 2013 13:59:53 +0800
+
+ubuntukylin-default-settings (1.0.7) saucy; urgency=low
+
+  * Correct the English explanation of slideshow and replace the slideshow
+    pictures
+  * Move depends.txt content to recommends.txt.
+  * Modify recommended packages:
+    - Removed: gnome-tweak-tool, chromium-browser, indicator-messages
+      ubiquity-plugin-ubuntuone ubuntu-wallpapers, ubuntu-wallpapers-saucy
+    - Added: fcitx-ui-qimpanel, ubuntukylin-wallpapers, youker-assistant
+  * Modify the Launcher:
+    - Removed: UbuntuOne, Amazon, UbuntuOne Music
+    - Added: youker-assistant, gnome-terminal
+  * Remove background picture, which is now in ubuntukylin-wallpapaers.
+  * Do not autostart:
+    deja-dup-monitor, vino-server, gnome-user-share
+
+ -- ShuiLu Pi <pishuilu1128@xxxxxxx>  Mon, 23 Sep 2013 17:30:27 +0800
+
+ubuntukylin-default-settings (1.0.6) saucy; urgency=low
+
+  * updated slideshow.
+
+ -- ShuiLu Pi <pishuilu1128@xxxxxxx>  Thu, 29 Aug 2013 22:34:55 +0800
+
 ubuntukylin-default-settings (1.0.5) saucy; urgency=low
 
-  * init for ubuntukylin 13.10. (LP: #1191632,#1163504)
+  * init for ubuntukylin 13.10. (LP: #1191632, #1163504)
 
  -- ShuiLu Pi <pishuilu1128@xxxxxxx>  Mon, 17 Jun 2013 19:24:16 +0800
 

=== modified file 'debian/control'
--- debian/control	2013-02-06 02:21:43 +0000
+++ debian/control	2013-11-11 07:04:47 +0000
@@ -4,7 +4,7 @@
 Maintainer: UbuntuKylin Team <ubuntukylin-members@xxxxxxxxxxxxxxxxxxx>
 Build-Depends: debhelper (>= 7.0.50~),
  ubuntu-defaults-builder
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Bzr: https://code.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk
 
@@ -16,7 +16,6 @@
 Provides: ubuntu-default-settings
 Conflicts: ubuntu-default-settings
 Description: Default settings for the UbuntuKylin desktop
- This package contains the default settings used by UbuntuKylin. It contains customized default settings for the Chinese Ubuntu
+ This package contains the default settings used by UbuntuKylin. 
+ It contains customized default settings for the Chinese Ubuntu
  Edition.
-
-

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-11-11 07:04:47 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== removed file 'debian/theme-tool.desktop'
--- debian/theme-tool.desktop	2013-03-14 05:44:26 +0000
+++ debian/theme-tool.desktop	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=主题设置
-Comment=Tweak advanced GNOME 3 settings
-Icon=gnome-tweak-tool
-Exec=gnome-tweak-tool
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Accessibility;Utility;Settings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;
-OnlyShowIn=GNOME;Unity;
-X-GNOME-Settings-Panel=gnome-tweak-tool
-Name[zh_CN]=主题设置

=== modified file 'debian/ubuntukylin-default-settings.install'
--- debian/ubuntukylin-default-settings.install	2013-03-14 05:44:26 +0000
+++ debian/ubuntukylin-default-settings.install	2013-11-11 07:04:47 +0000
@@ -1,4 +1,2 @@
 debian/20_ubuntukylin-default-settings.gschema.override usr/share/glib-2.0/schemas
-
-debian/theme-tool.desktop /usr/share/applications
-
+icons/UbuntuLogo.png /usr/share/icons/hicolor

=== modified file 'depends.txt'
--- depends.txt	2013-06-17 11:35:16 +0000
+++ depends.txt	2013-11-11 07:04:47 +0000
@@ -14,24 +14,3 @@
 #
 # Example:
 # manpages-de
-
-# local services
-unity-china-music-scope
-
-# subset of complete language support:
-firefox-locale-zh-hans
-thunderbird-locale-zh-hans
-thunderbird-locale-zh-cn
-libreoffice-l10n-zh-cn
-
-#default apps
-cheese
-smplayer
-ubuntukylin-theme
-chinese-calendar
-indicator-china-weather
-gnome-tweak-tool
-fcitx-googlepinyin
-fcitx-table-wubi
-nautilus-open-terminal
-chromium-browser

=== removed file 'desktop/background.jpg'
Binary files desktop/background.jpg	2013-06-20 13:06:57 +0000 and desktop/background.jpg	1970-01-01 00:00:00 +0000 differ
=== modified file 'hooks/chroot'
--- hooks/chroot	2013-04-16 02:37:18 +0000
+++ hooks/chroot	2013-11-11 07:04:47 +0000
@@ -7,10 +7,31 @@
 # before it is packed into a squashfs. This is where you can apply extra tweaks
 # to the live system.
 
-apt-get purge --auto-remove -y ibus ibus-gtk ibus-gtk3 python-ibus ibus-pinyin-db-android libopencc1 
+apt-get purge --auto-remove -y ibus ibus-gtk ibus-gtk3 python-ibus ibus-pinyin-db-android libopencc1 ubiquity-plugin-ubuntuone ubuntu-wallpapers ubuntu-wallpapers-saucy indicator-messages 
 apt-get purge --auto-remove -y totem totem-common gstreamer1.0-clutter libtotem0 gir1.2-totem-plparser-1.0 libreoffice-help-en-us
 apt-get purge --auto-remove -y language-pack-de language-pack-es language-pack-pt firefox-locale-de firefox-locale-es firefox-locale-pt
 apt-get purge --auto-remove -y example-content guile-2.0-libs liblouis-data lintian landscape-client-ui-install
 apt-get purge --auto-remove -y fonts-freefont-ttf fonts-kacst fonts-kacst-one fonts-lao fonts-nanum fonts-takao-pgothic fonts-tlwg-kinnari fonts-tlwg-loma fonts-tlwg-mono fonts-tlwg-norasi fonts-tlwg-purisa fonts-tlwg-sawasdee fonts-tlwg-typewriter fonts-tlwg-typist fonts-tlwg-typo fonts-tlwg-umpush fonts-tlwg-waree fonts-thai-tlwg 
 mkdir -p /etc/skel/桌面
 cp /usr/share/applications/firefox.desktop /etc/skel/桌面/
+
+sed -i "s/\`lsb_release -i -s 2> \/dev\/null || echo Debian\`/UbuntuKylin/g" /etc/default/grub
+sed -i "/DISTRIB_DESCRIPTION/s/Ubuntu/UbuntuKylin/g" /etc/lsb-release
+sed -i "s/Ubuntu/UbuntuKylin/g" /usr/lib/firefox/distribution/distribution.ini
+sed -i "s/canonical/UbuntuKylin/g" /usr/lib/firefox/distribution/distribution.ini
+cp -f /usr/share/icons/hicolor/UbuntuLogo.png /usr/share/gnome-control-center/ui/UbuntuLogo.png
+
+
+# Close the startup applications
+if [ -f "/etc/xdg/autostart/deja-dup-monitor.desktop" ];then
+echo "\nX-GNOME-Autostart-enabled=false" >> /etc/xdg/autostart/deja-dup-monitor.desktop
+fi
+if [ -f "/etc/xdg/autostart/vino-server.desktop" ];then
+echo "\nX-GNOME-Autostart-enabled=false" >> /etc/xdg/autostart/vino-server.desktop
+fi
+if [ -f "/etc/xdg/autostart/gnome-user-share.desktop" ];then
+echo "\nX-GNOME-Autostart-enabled=false" >> /etc/xdg/autostart/gnome-user-share.desktop
+fi
+if [ -f "/etc/xdg/autostart/update-notifier.desktop" ];then
+echo "\nX-GNOME-Autostart-enabled=false" >> /etc/xdg/autostart/update-notifier.desktop
+fi

=== added file 'icons/UbuntuLogo.png'
Binary files icons/UbuntuLogo.png	1970-01-01 00:00:00 +0000 and icons/UbuntuLogo.png	2013-11-11 07:04:47 +0000 differ
=== modified file 'recommends.txt'
--- recommends.txt	2013-01-25 07:52:38 +0000
+++ recommends.txt	2013-11-11 07:04:47 +0000
@@ -16,3 +16,27 @@
 #
 # Example:
 # fortunes-de
+
+# local services
+unity-china-music-scope
+unity-china-photo-scope
+unity-china-video-scope
+youker-assistant
+ubuntukylin-wallpapers
+fcitx-ui-qimpanel
+
+# subset of complete language support:
+firefox-locale-zh-hans
+thunderbird-locale-zh-hans
+thunderbird-locale-zh-cn
+libreoffice-l10n-zh-cn
+
+#default apps
+cheese
+smplayer
+ubuntukylin-theme
+chinese-calendar
+indicator-china-weather
+fcitx-googlepinyin
+fcitx-table-wubi
+nautilus-open-terminal

=== modified file 'ubiquity-slideshow/slides/en_US/accessibility.html'
--- ubiquity-slideshow/slides/en_US/accessibility.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/en_US/accessibility.html	2013-11-11 07:04:47 +0000
@@ -1,16 +1,15 @@
-<div class="header"><h1 class="slidetitle">Our forum</h1></div>
+<div class="header"><h1 class="slidetitle">Kuaipan of Kingsoft for UbuntuKylin</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>UbuntuKylin Chinese official forum, including: Community News, Feedback, Learn, technical exchange, application development, to let you join in UbuntuKylin.</p>
-</div>
-
-</div>
-
-<img class="screenshot" src="screenshots/luntan.jpg" />
-
-</div>
-
+<p>Kingsoft Kuaipan is a Linux cloud storage client jointly developed by UbuntuKylin and the Kingsoft Inc. It provides file synchronization, backup, and sharing capabilities.  Please look forward to its release.</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/fastdisk.png" />
+
+</div>

=== modified file 'ubiquity-slideshow/slides/en_US/browse.html'
--- ubiquity-slideshow/slides/en_US/browse.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/en_US/browse.html	2013-11-11 07:04:47 +0000
@@ -1,11 +1,11 @@
-<div class="header"><h1 class="slidetitle">Timely and accurate weather information </h1></div>
+<div class="header"><h1 class="slidetitle">The lunar calendar and weather</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>The weather forecast information in detail,six days weather forecast,PM2.5 and so on.Provide effective references for your daily life and travel.</p>
+<p>Upgraded lunar calendar and weather widget: By adding the lunar calendar skin-changing feature and improving the weather forecast accuracy, it allows you to have a better planned life.</p>
 </div>
 
 <div class="featured">
@@ -15,11 +15,15 @@
 	<img class="icon" src="icons/indicator-china-weather.png" />
 	<p class="caption">indicator-china-weather</p>
 	</li>
+	<li>
+        <img class="icon" src="icons/chinese-calendar.png" />
+        <p class="caption">chinese-calendar</p>
+	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/weather.jpg" />
+<img class="screenshot" src="screenshots/weather.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/en_US/gethelp.html'
--- ubiquity-slideshow/slides/en_US/gethelp.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/en_US/gethelp.html	2013-11-11 07:04:47 +0000
@@ -1,15 +1,18 @@
-<div class="header"><h1 class="slidetitle">Thank you!</h1></div>
+<div class="header"><h1 class="slidetitle">The community introduction</h1></div>
 
-<div class="main wide">
+<div class="main">
 
 <div class="text">
 
 <div>
-<p>This installation will be completed in 20 minutes, if you have any questions, please visit <a href="http://www.ubuntukylin.com/";>www.ubuntukylin.com</a>.</p>
-</div>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
+<p>Openness, cooperation, innovation</p>
+<p>Regardless of whether you are an experienced user or a newbie, the UbuntuKylin Community will maintain a communication platform for the ubiquitous "Youker Friends" to exchange the latest and the most professional technical information and community news--by utilizing official website, forums, microblogs, weixin, and various other channels.</p>
+<p>Welcome to visit:</p>
+<p><a href="http://www.ubuntukylin.com";>www.ubuntukylin.com </a>.</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/luntan.png" />
 
 </div>

=== added file 'ubiquity-slideshow/slides/en_US/icons/ubuntukylin.png'
Binary files ubiquity-slideshow/slides/en_US/icons/ubuntukylin.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/icons/ubuntukylin.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/icons/youker-assistant.png'
Binary files ubiquity-slideshow/slides/en_US/icons/youker-assistant.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/icons/youker-assistant.png	2013-11-11 07:04:47 +0000 differ
=== modified file 'ubiquity-slideshow/slides/en_US/music.html'
--- ubiquity-slideshow/slides/en_US/music.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/en_US/music.html	2013-11-11 07:04:47 +0000
@@ -1,25 +1,25 @@
-<div class="header"><h1 class="slidetitle">Take your music with you</h1></div>
+<div class="header"><h1 class="slidetitle">Youker Assistant</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>More simple and convenient music search, to help you find the latest, most hot Chinese pop songs.</p>
+<p>Youker Assistant is a system management and configuration tool we developed for UbuntuKylin users; it is based on Qt/QML and Python implementations and allows your desktop to be more streamlined, more user-friendly, and enriched with personality.</p>
 </div>
 
 <div class="featured">
 <h2 class="subtitle">Included software</h2>
 <ul>
 	<li>
-	<img class="icon" src="icons/unity-china-music-scope.png" />
-	<p class="caption">unity-china-music-scope</p>
+	<img class="icon" src="icons/youker-assistant.png" />
+	<p class="caption">youker-assistant</p>
 	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/music.jpg" />
+<img class="screenshot" src="screenshots/youker.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/en_US/office.html'
--- ubiquity-slideshow/slides/en_US/office.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/en_US/office.html	2013-11-11 07:04:47 +0000
@@ -1,20 +1,21 @@
-<div class="header"><h1 class="slidetitle">Popular Chinese office software</h1></div>
+<div class="header"><h1 class="slidetitle">WPS for UbuntuKylin</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>Most advanced text tools for Chinese creative, compatible with multiple formats documents, powerful graphic layout, a wealth of online resources library, so that your document production is both professional and relaxed.You can easily get WPS for UbuntuKylin on: <a href="http://www.ubuntukylin.com/download.html";>www.ubuntukylin.com/download.html</a>.</p>
+<p>Domestic text processing tools, compatible with Microsoft Office file formats, powerful typesetting features and extensive online resources. You can get it here:</p>
+<p><a href="http://www.ubuntukylin.com/download.html";>www.ubuntukylin.com/download.html</a>.</p>
 </div>
 
 <div class="featured">
 <h2 class="subtitle">Supported software</h2>
 <ul>
-        <li>
-        <img class="icon" src="icons/wps-office-wpsmain.png" />
-        <p class="caption">wps</p>
-        </li>
+	<li>
+	<img class="icon" src="icons/wps-office-wpsmain.png" />
+	<p class="caption">wps</p>
+	</li>
         <li>
         <img class="icon" src="icons/wps-office-wppmain.png" />
         <p class="caption">wpp</p>
@@ -28,6 +29,6 @@
 
 </div>
 
-<img class="screenshot" src="screenshots/office.jpg" />
+<img class="screenshot" src="screenshots/wps.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/en_US/photos.html'
--- ubiquity-slideshow/slides/en_US/photos.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/en_US/photos.html	2013-11-11 07:04:47 +0000
@@ -5,7 +5,7 @@
 <div class="text">
 
 <div>
-<p>The default input method using fcitx, support cloud Pinyin input, more intelligent association.</p>
+<p>Through the improved Fcitx package (a.k.a. the "Little Penguin" Input Method), we are providing you with a different Chinese input experience.</p>
 </div>
 
 <div class="featured">
@@ -20,6 +20,6 @@
 
 </div>
 
-<img class="screenshot" src="screenshots/inputmethod.jpg" />
+<img class="screenshot" src="screenshots/inputmethod.png" />
 
 </div>

=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/calendar.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/calendar.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/calendar.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/dash.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/dash.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/dash.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/fastdisk.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/fastdisk.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/fastdisk.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/inputmethod.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/inputmethod.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/inputmethod.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/inputmethod.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/inputmethod.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/inputmethod.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/luntan.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/luntan.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/luntan.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/luntan.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/luntan.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/luntan.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/music.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/music.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/music.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/office.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/office.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/office.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/themes.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/themes.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/themes.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/themes.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/themes.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/themes.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/weather.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/weather.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/weather.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/weather.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/weather.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/weather.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/welcome.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/welcome.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/welcome.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/welcome.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/welcome.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/welcome.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/en_US/screenshots/wiki.jpg'
Binary files ubiquity-slideshow/slides/en_US/screenshots/wiki.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/screenshots/wiki.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/wps.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/wps.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/wps.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/en_US/screenshots/youker.png'
Binary files ubiquity-slideshow/slides/en_US/screenshots/youker.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/en_US/screenshots/youker.png	2013-11-11 07:04:47 +0000 differ
=== modified file 'ubiquity-slideshow/slides/en_US/social.html'
--- ubiquity-slideshow/slides/en_US/social.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/en_US/social.html	2013-11-11 07:04:47 +0000
@@ -1,11 +1,11 @@
-<div class="header"><h1 class="slidetitle">Our wiki page</h1></div>
+<div class="header"><h1 class="slidetitle">我们的wiki</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>UbuntuKylin English the official home page, you can quickly locate and join each team, including: a team of developers, community team, quality assurance team, release team, documentation team.</p>
+<p>UbuntuKylin英文官方主页,可快速定位并加入各个相关团队,包括:开发者团队、社区团队、质量确保团队、发布团队、文档团队。</p>
 </div>
 
 </div>

=== modified file 'ubiquity-slideshow/slides/en_US/ubuntuone.html'
--- ubiquity-slideshow/slides/en_US/ubuntuone.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/en_US/ubuntuone.html	2013-11-11 07:04:47 +0000
@@ -1,25 +1,33 @@
-<div class="header"><h1 class="slidetitle">Traditional calendar information</h1></div>
+<div class="header"><h1 class="slidetitle">The Dash Chinese search</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>Ease of use, the authority of the Chinese calendar, contains the traditional lunar calendar and the Gregorian calendar to facilitate inquiries holidays.It has notes function to help you record the details of life.</p>
+<p>One-Stop search for the Chinese music, photos, video resources--everything you want is at your disposal.  Let's start searching with Dash-Chinese now!</p>
 </div>
 
 <div class="featured">
 <h2 class="subtitle">Included software</h2>
 <ul>
 	<li>
-	<img class="icon" src="icons/chinese-calendar.png" />
-	<p class="caption">chinese-calendar</p>
+        <img class="icon" src="icons/ubuntukylin.png" />
+	<p class="caption">unity-china-music-scope</p>
+	</li>
+	<li>
+        <img class="icon" src="icons/ubuntukylin.png" />
+        <p class="caption">unity-china-photo-scope</p>
+	</li>
+	<li>
+        <img class="icon" src="icons/ubuntukylin.png" />
+        <p class="caption">unity-china-video-scope</p>
 	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/calendar.jpg" />
+<img class="screenshot" src="screenshots/dash.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/en_US/usc.html'
--- ubiquity-slideshow/slides/en_US/usc.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/en_US/usc.html	2013-11-11 07:04:47 +0000
@@ -1,15 +1,15 @@
-<div class="header"><h1 class="slidetitle">Considerate desktop theme</h1></div>
+<div class="header"><h1 class="slidetitle">System customization</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>The desktop theme and shortcut icon is designed specifically for Chinese users,with the Chinese style element.</p>
-</div>
-
-</div>
-
-<img class="screenshot" src="screenshots/themes.jpg" />
+<p>Desktop themes specifically designed for Chinese users. Stunning boot-up animations. Allowing you to appreciate the efforts we have devoted even to the details!</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/themes.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/en_US/welcome.html'
--- ubiquity-slideshow/slides/en_US/welcome.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/en_US/welcome.html	2013-11-11 07:04:47 +0000
@@ -5,13 +5,12 @@
 <div class="text">
 
 <div>
-<p>Thank you for choosing UbuntuKylin.</p>
-<p>UbuntuKylin is an open source desktop operating system specially designed for Chinese users.We are committed to provide you with a delicate, thoughtful user experience. </p>
-<p>The following slides will introduce you to the features custom made for Chinese users fluently.</p>
-</div>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
+<p>UbuntuKylin is an official flavor of Ubuntu, specifically endeavered to tailor a desktop operating system with distinct Chinese characteristics, so as to allow its users to enjoy a thoughtful and fine user experience.</p>
+<p>The following pictures will show you what we have done in localization for Chinese users.</p>
+</div>
+
+</div>
+
+<img class="background" src="screenshots/welcome.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_CN/accessibility.html'
--- ubiquity-slideshow/slides/zh_CN/accessibility.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/zh_CN/accessibility.html	2013-11-11 07:04:47 +0000
@@ -1,15 +1,15 @@
-<div class="header"><h1 class="slidetitle">我们的论坛</h1></div>
+<div class="header"><h1 class="slidetitle">金山快盘 for UbuntuKylin</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>UbuntuKylin中文官方论坛,包括:社区新闻、问题反馈、学习园地、技术交流、应用开发,让您深度参与UbuntuKylin全过程。</p>
-</div>
-
-</div>
-
-<img class="screenshot" src="screenshots/luntan.jpg" />
+<p>金山快盘 for UbuntuKylin是UbuntuKylin团队与金山公司联合开发的Linux版网盘客户端,具备文件同步、备份和共享功能,敬请期待。</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/fastdisk.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_CN/browse.html'
--- ubiquity-slideshow/slides/zh_CN/browse.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/zh_CN/browse.html	2013-11-11 07:04:47 +0000
@@ -1,11 +1,11 @@
-<div class="header"><h1 class="slidetitle">及时准确的天气信息</h1></div>
+<div class="header"><h1 class="slidetitle">农历和天气</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>详尽的天气信息,最长六天预报,更有PM2.5等热门信息,为您的日常生活及出行提供有效参考。</p>
+<p>升级后的中国农历和天气插件,增加农历换肤功能,提高天气预报准确性,让您的生活更有计划!</p>
 </div>
 
 <div class="featured">
@@ -15,11 +15,15 @@
 	<img class="icon" src="icons/indicator-china-weather.png" />
 	<p class="caption">indicator-china-weather</p>
 	</li>
+	<li>
+        <img class="icon" src="icons/chinese-calendar.png" />
+        <p class="caption">chinese-calendar</p>
+	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/weather.jpg" />
+<img class="screenshot" src="screenshots/weather.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_CN/gethelp.html'
--- ubiquity-slideshow/slides/zh_CN/gethelp.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_CN/gethelp.html	2013-11-11 07:04:47 +0000
@@ -1,15 +1,18 @@
-<div class="header"><h1 class="slidetitle">谢谢!</h1></div>
+<div class="header"><h1 class="slidetitle">社区</h1></div>
 
-<div class="main wide">
+<div class="main">
 
 <div class="text">
 
 <div>
-<p>本次安装将在20分钟之内结束,如果您有任何疑问,请访问 <a href="http://www.ubuntukylin.com/";>www.ubuntukylin.com</a>进行反馈。</p>
-</div>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
+<p>开放、合作、创新</p>
+<p>无论您是高手还是菜鸟,UbuntuKylin社区都将通过官网、论坛、微博、微信等多种渠道为您传递最新、最专业的技术咨询和社区动态,为广大优客朋友提供交流平台。</p>
+<p>欢迎访问:</p>
+<p><a href="http://www.ubuntukylin.com";>www.ubuntukylin.com </a>.</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/luntan.png" />
 
 </div>

=== added file 'ubiquity-slideshow/slides/zh_CN/icons/ubuntukylin.png'
Binary files ubiquity-slideshow/slides/zh_CN/icons/ubuntukylin.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/icons/ubuntukylin.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/icons/youker-assistant.png'
Binary files ubiquity-slideshow/slides/zh_CN/icons/youker-assistant.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/icons/youker-assistant.png	2013-11-11 07:04:47 +0000 differ
=== modified file 'ubiquity-slideshow/slides/zh_CN/music.html'
--- ubiquity-slideshow/slides/zh_CN/music.html	2013-03-13 11:50:59 +0000
+++ ubiquity-slideshow/slides/zh_CN/music.html	2013-11-11 07:04:47 +0000
@@ -1,25 +1,25 @@
-<div class="header"><h1 class="slidetitle">把音乐随时带在身边</h1></div>
+<div class="header"><h1 class="slidetitle">优客助手</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>更为简单便捷的音乐搜索,帮您找到最新、最热的中文流行歌曲。</p>
+<p>优客助手是我们专为UbuntuKylin用户打造的系统级管理与配置工具,基于Qt/QML、Python实现,让您的桌面更加流畅、易用而富有个性!</p>
 </div>
 
 <div class="featured">
 <h2 class="subtitle">包含软件</h2>
 <ul>
 	<li>
-	<img class="icon" src="icons/unity-china-music-scope.png" />
-	<p class="caption">unity-china-music-scope</p>
+	<img class="icon" src="icons/youker-assistant.png" />
+	<p class="caption">youker-assistant</p>
 	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/music.jpg" />
+<img class="screenshot" src="screenshots/youker.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_CN/office.html'
--- ubiquity-slideshow/slides/zh_CN/office.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/zh_CN/office.html	2013-11-11 07:04:47 +0000
@@ -1,11 +1,11 @@
-<div class="header"><h1 class="slidetitle">流行的中文办公软件</h1></div>
+<div class="header"><h1 class="slidetitle">WPS for UbuntuKylin</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>最适合中文创作的先进文字工具,兼容多种格式文档,强大图文排版,丰富的在线资源库,让您的文档制作既专业又轻松。您可以在以下地址轻松的获取WPS for UbuntuKylin:</p>
+<p>国产文字处理工具,兼容微软Office文档格式,强大的图文排版功能、丰富的在线资源,让您的文档制作既专业又轻松。您可以在以下地址轻松获取:</p>
 <p><a href="http://www.ubuntukylin.com/download.html";>www.ubuntukylin.com/download.html</a>.</p>
 </div>
 
@@ -29,6 +29,6 @@
 
 </div>
 
-<img class="screenshot" src="screenshots/office.jpg" />
+<img class="screenshot" src="screenshots/wps.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_CN/photos.html'
--- ubiquity-slideshow/slides/zh_CN/photos.html	2013-03-13 11:50:59 +0000
+++ ubiquity-slideshow/slides/zh_CN/photos.html	2013-11-11 07:04:47 +0000
@@ -5,7 +5,7 @@
 <div class="text">
 
 <div>
-<p>默认使用小企鹅输入法,支持云拼音输入,更强智能关联。</p>
+<p>通过改进小企鹅(Fcitx)输入法,带给您不一样的中文输入体验。</p>
 </div>
 
 <div class="featured">
@@ -20,6 +20,6 @@
 
 </div>
 
-<img class="screenshot" src="screenshots/inputmethod.jpg" />
+<img class="screenshot" src="screenshots/inputmethod.png" />
 
 </div>

=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/calendar.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/calendar.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/calendar.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/dash.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/dash.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/dash.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/fastdisk.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/fastdisk.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/fastdisk.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/inputmethod.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/inputmethod.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/inputmethod.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/inputmethod.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/inputmethod.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/inputmethod.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/luntan.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/luntan.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/luntan.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/luntan.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/luntan.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/luntan.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/music.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/music.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/music.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/office.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/office.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/office.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/themes.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/themes.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/themes.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/themes.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/themes.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/themes.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/weather.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/weather.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/weather.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/weather.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/weather.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/weather.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/welcome.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/welcome.jpg	2013-03-13 11:50:59 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/welcome.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/welcome.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/welcome.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/welcome.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/screenshots/wiki.jpg'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/wiki.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/wiki.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/wps.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/wps.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/wps.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_CN/screenshots/youker.png'
Binary files ubiquity-slideshow/slides/zh_CN/screenshots/youker.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_CN/screenshots/youker.png	2013-11-11 07:04:47 +0000 differ
=== modified file 'ubiquity-slideshow/slides/zh_CN/ubuntuone.html'
--- ubiquity-slideshow/slides/zh_CN/ubuntuone.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_CN/ubuntuone.html	2013-11-11 07:04:47 +0000
@@ -1,25 +1,33 @@
-<div class="header"><h1 class="slidetitle">传统的日历信息</h1></div>
+<div class="header"><h1 class="slidetitle">Dash中文搜索</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>易用、权威的中文日历,包含传统农历和公历,方便节假日查询,更有便签功能,助您记录生活点滴。</p>
+<p>一站式搜索,中文音乐、图片、视频资源一网打尽,赶紧使用Dash中文搜索吧!</p>
 </div>
 
 <div class="featured">
 <h2 class="subtitle">包含软件</h2>
 <ul>
 	<li>
-	<img class="icon" src="icons/chinese-calendar.png" />
-	<p class="caption">chinese-calendar</p>
+        <img class="icon" src="icons/ubuntukylin.png" />
+	<p class="caption">unity-china-music-scope</p>
+	</li>
+	<li>
+        <img class="icon" src="icons/ubuntukylin.png" />
+        <p class="caption">unity-china-photo-scope</p>
+	</li>
+	<li>
+        <img class="icon" src="icons/ubuntukylin.png" />
+        <p class="caption">unity-china-video-scope</p>
 	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/calendar.jpg" />
+<img class="screenshot" src="screenshots/dash.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_CN/usc.html'
--- ubiquity-slideshow/slides/zh_CN/usc.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_CN/usc.html	2013-11-11 07:04:47 +0000
@@ -1,15 +1,15 @@
-<div class="header"><h1 class="slidetitle">体贴的桌面主题</h1></div>
+<div class="header"><h1 class="slidetitle">系统定制</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>专为中文用户设计的桌面主题与快捷图标,融入中国风元素。</p>
-</div>
-
-</div>
-
-<img class="screenshot" src="screenshots/themes.jpg" />
+<p>专为中文用户提供的桌面主题,优美的开机动画,让您体验到我们在细节上所做的处理。</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/themes.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_CN/welcome.html'
--- ubiquity-slideshow/slides/zh_CN/welcome.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_CN/welcome.html	2013-11-11 07:04:47 +0000
@@ -5,13 +5,12 @@
 <div class="text">
 
 <div>
-<p>感谢您选择UbuntuKylin</p>
-<p>UbuntuKylin是一款专为中文用户定制的开源桌面操作系统,我们致力于为您提供细腻、体贴的用户体验。</p>
-<p>下面一组幻灯片将为您介绍目前我们为中文用户所做的特色定制。</p>
-</div>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
+<p>UbuntuKylin是Ubuntu官方中文衍生版,致力于更有中国味的桌面终端操作系统,为您提供体贴、细腻的用户体验。</p>
+<p>在接下来的时间您将了解到我们为中文用户所做的特色定制!</p>
+</div>
+
+</div>
+
+<img class="background" src="screenshots/welcome.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/accessibility.html'
--- ubiquity-slideshow/slides/zh_TW/accessibility.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/zh_TW/accessibility.html	2013-11-11 07:04:47 +0000
@@ -1,16 +1,15 @@
-<div class="header"><h1 class="slidetitle">我們的論壇</h1></div>
+<div class="header"><h1 class="slidetitle">金山快盤 for UbuntuKylin</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>UbuntuKylin中文官方論壇,包括:社區新聞、問題反饋、學習園地、技術交流、應用開發,讓您深度參與UbuntuKylin全過程。</p>
-</div>
-
-</div>
-
-<img class="screenshot" src="screenshots/luntan.jpg" />
-
-</div>
-
+<p>金山快盤 for UbuntuKylin是UbuntuKylin團隊與金山公司聯合開發的Linux版網盤客戶端,具備文件同步、備份和共享功能,敬請期待。</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/fastdisk.png" />
+
+</div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/browse.html'
--- ubiquity-slideshow/slides/zh_TW/browse.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/zh_TW/browse.html	2013-11-11 07:04:47 +0000
@@ -1,25 +1,29 @@
-<div class="header"><h1 class="slidetitle">及時准確的天氣信息</h1></div>
+<div class="header"><h1 class="slidetitle">農曆和天氣</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>詳盡的天氣信息,最長六天預報,更有PM2.5等熱門信息,爲您的日常生活及出行提供有效參考。</p>
+<p>升級後的中國農曆和天氣插件,增加農曆換膚功能,提高天氣預報准確性,讓您的生活更有計劃!</p>
 </div>
 
 <div class="featured">
-<h2 class="subtitle">包含軟體</h2>
+<h2 class="subtitle">包含軟件</h2>
 <ul>
 	<li>
 	<img class="icon" src="icons/indicator-china-weather.png" />
 	<p class="caption">indicator-china-weather</p>
 	</li>
+	<li>
+        <img class="icon" src="icons/chinese-calendar.png" />
+        <p class="caption">chinese-calendar</p>
+	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/weather.jpg" />
+<img class="screenshot" src="screenshots/weather.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/gethelp.html'
--- ubiquity-slideshow/slides/zh_TW/gethelp.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_TW/gethelp.html	2013-11-11 07:04:47 +0000
@@ -1,15 +1,18 @@
-<div class="header"><h1 class="slidetitle">謝謝!</h1></div>
+<div class="header"><h1 class="slidetitle">社區</h1></div>
 
-<div class="main wide">
+<div class="main">
 
 <div class="text">
 
 <div>
-<p>本次安裝將在20分鍾之內結束,如果您有任何疑問,請訪問 <a href="http://www.ubuntukylin.com/";>www.ubuntukylin.com</a>進行反饋。</p>
-</div>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
+<p>開放、合作、創新</p>
+<p>無論您是高手還是菜鳥,UbuntuKylin社區都將通過官網、論壇、微博、微信等多種渠道爲您傳遞最新、最專業的技術咨詢和社區動態,爲廣大優客朋友提供交流平台。</p>
+<p>歡迎訪問:</p>
+<p><a href="http://www.ubuntukylin.com";>www.ubuntukylin.com </a>.</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/luntan.png" />
 
 </div>

=== added file 'ubiquity-slideshow/slides/zh_TW/icons/ubuntukylin.png'
Binary files ubiquity-slideshow/slides/zh_TW/icons/ubuntukylin.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/icons/ubuntukylin.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/icons/youker-assistant.png'
Binary files ubiquity-slideshow/slides/zh_TW/icons/youker-assistant.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/icons/youker-assistant.png	2013-11-11 07:04:47 +0000 differ
=== modified file 'ubiquity-slideshow/slides/zh_TW/music.html'
--- ubiquity-slideshow/slides/zh_TW/music.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_TW/music.html	2013-11-11 07:04:47 +0000
@@ -1,25 +1,25 @@
-<div class="header"><h1 class="slidetitle">把音樂隨時帶在身邊</h1></div>
+<div class="header"><h1 class="slidetitle">優客助手</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>更爲簡單便捷的音樂搜索,幫您找到最新、最熱的中文流行歌曲。</p>
+<p>優客助手是我們專爲UbuntuKylin用戶打造的系統級管理與配置工具,基于Qt/QML、Python實現,讓您的桌面更加流暢、易用而富有個性!</p>
 </div>
 
 <div class="featured">
-<h2 class="subtitle">包含軟體</h2>
+<h2 class="subtitle">包含軟件</h2>
 <ul>
 	<li>
-	<img class="icon" src="icons/unity-china-music-scope.png" />
-	<p class="caption">unity-china-music-scope</p>
+	<img class="icon" src="icons/youker-assistant.png" />
+	<p class="caption">youker-assistant</p>
 	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/music.jpg" />
+<img class="screenshot" src="screenshots/youker.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/office.html'
--- ubiquity-slideshow/slides/zh_TW/office.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/zh_TW/office.html	2013-11-11 07:04:47 +0000
@@ -1,21 +1,21 @@
-<div class="header"><h1 class="slidetitle">流行的中文辦公軟體</h1></div>
+<div class="header"><h1 class="slidetitle">WPS for UbuntuKylin</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>最適合中文創作的先進文字工具,兼容多種格式文檔,強大圖文排版,豐富的在線資源庫,讓您的文檔製作既專業又輕鬆。您可以在以下地址輕松的獲取WPS for UbuntuKylin:</p>
+<p>國産文字處理工具,兼容微軟Office文檔格式,強大的圖文排版功能、豐富的在線資源,讓您的文檔制作既專業又輕松。您可以在以下地址輕松獲取:</p>
 <p><a href="http://www.ubuntukylin.com/download.html";>www.ubuntukylin.com/download.html</a>.</p>
 </div>
 
 <div class="featured">
-<h2 class="subtitle">支持軟體</h2>
+<h2 class="subtitle">支持軟件</h2>
 <ul>
-        <li>
-        <img class="icon" src="icons/wps-office-wpsmain.png" />
-        <p class="caption">wps</p>
-        </li>
+	<li>
+	<img class="icon" src="icons/wps-office-wpsmain.png" />
+	<p class="caption">wps</p>
+	</li>
         <li>
         <img class="icon" src="icons/wps-office-wppmain.png" />
         <p class="caption">wpp</p>
@@ -29,6 +29,6 @@
 
 </div>
 
-<img class="screenshot" src="screenshots/office.jpg" />
+<img class="screenshot" src="screenshots/wps.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/photos.html'
--- ubiquity-slideshow/slides/zh_TW/photos.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_TW/photos.html	2013-11-11 07:04:47 +0000
@@ -5,11 +5,11 @@
 <div class="text">
 
 <div>
-<p>默認使用小企鵝輸入法,支持雲拼音輸入,更強智能關聯。</p>
+<p>通過改進小企鵝(Fcitx)輸入法,帶給您不一樣的中文輸入體驗。</p>
 </div>
 
 <div class="featured">
-<h2 class="subtitle">包含軟體</h2>
+<h2 class="subtitle">包含軟件</h2>
 <ul>
 	<li>
 	<img class="icon" src="icons/fcitx.png" />
@@ -20,6 +20,6 @@
 
 </div>
 
-<img class="screenshot" src="screenshots/inputmethod.jpg" />
+<img class="screenshot" src="screenshots/inputmethod.png" />
 
 </div>

=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/calendar.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/calendar.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/calendar.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/dash.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/dash.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/dash.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/fastdisk.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/fastdisk.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/fastdisk.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/inputmethod.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/inputmethod.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/inputmethod.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/inputmethod.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/inputmethod.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/inputmethod.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/luntan.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/luntan.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/luntan.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/luntan.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/luntan.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/luntan.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/music.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/music.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/music.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/office.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/office.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/office.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/themes.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/themes.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/themes.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/themes.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/themes.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/themes.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/weather.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/weather.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/weather.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/weather.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/weather.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/weather.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/welcome.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/welcome.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/welcome.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/welcome.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/welcome.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/welcome.png	2013-11-11 07:04:47 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/screenshots/wiki.jpg'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/wiki.jpg	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/wiki.jpg	1970-01-01 00:00:00 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/wps.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/wps.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/wps.png	2013-11-11 07:04:47 +0000 differ
=== added file 'ubiquity-slideshow/slides/zh_TW/screenshots/youker.png'
Binary files ubiquity-slideshow/slides/zh_TW/screenshots/youker.png	1970-01-01 00:00:00 +0000 and ubiquity-slideshow/slides/zh_TW/screenshots/youker.png	2013-11-11 07:04:47 +0000 differ
=== modified file 'ubiquity-slideshow/slides/zh_TW/social.html'
--- ubiquity-slideshow/slides/zh_TW/social.html	2013-04-19 07:36:37 +0000
+++ ubiquity-slideshow/slides/zh_TW/social.html	2013-11-11 07:04:47 +0000
@@ -1,11 +1,11 @@
-<div class="header"><h1 class="slidetitle">我們的wiki</h1></div>
+<div class="header"><h1 class="slidetitle">我们的wiki</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>UbuntuKylin英文官方主頁,可快速定位並加入各個相關團隊,包括:開發者團隊、社區團隊、質量確保團隊、發布團隊、文檔團隊。</p>
+<p>UbuntuKylin英文官方主页,可快速定位并加入各个相关团队,包括:开发者团队、社区团队、质量确保团队、发布团队、文档团队。</p>
 </div>
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/ubuntuone.html'
--- ubiquity-slideshow/slides/zh_TW/ubuntuone.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_TW/ubuntuone.html	2013-11-11 07:04:47 +0000
@@ -1,25 +1,33 @@
-<div class="header"><h1 class="slidetitle">傳統的日曆信息</h1></div>
+<div class="header"><h1 class="slidetitle">Dash中文搜索</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>易用、權威的中文日曆,包含傳統農曆和公曆,方便節假日查詢,更有便簽功能,助您記錄生活點滴。</p>
+<p>一站式搜索,中文音樂、圖片、視頻資源一網打盡,趕緊使用Dash中文搜索吧!</p>
 </div>
 
 <div class="featured">
-<h2 class="subtitle">包含軟體</h2>
+<h2 class="subtitle">包含軟件</h2>
 <ul>
 	<li>
-	<img class="icon" src="icons/chinese-calendar.png" />
-	<p class="caption">chinese-calendar</p>
+        <img class="icon" src="icons/ubuntukylin.png" />
+	<p class="caption">unity-china-music-scope</p>
+	</li>
+	<li>
+        <img class="icon" src="icons/ubuntukylin.png" />
+        <p class="caption">unity-china-photo-scope</p>
+	</li>
+	<li>
+        <img class="icon" src="icons/ubuntukylin.png" />
+        <p class="caption">unity-china-video-scope</p>
 	</li>
 </ul>
 </div>
 
 </div>
 
-<img class="screenshot" src="screenshots/calendar.jpg" />
+<img class="screenshot" src="screenshots/dash.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/usc.html'
--- ubiquity-slideshow/slides/zh_TW/usc.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_TW/usc.html	2013-11-11 07:04:47 +0000
@@ -1,15 +1,15 @@
-<div class="header"><h1 class="slidetitle">體貼的桌面主題</h1></div>
+<div class="header"><h1 class="slidetitle">系统定制</h1></div>
 
 <div class="main">
 
 <div class="text">
 
 <div>
-<p>專爲中文用戶設計的桌面主題與快捷圖標,融入中國風元素。</p>
-</div>
-
-</div>
-
-<img class="screenshot" src="screenshots/themes.jpg" />
+<p>專爲中文用戶提供的桌面主題,優美的開機動畫,讓您體驗到我們在細節上所做的處理。</p>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/themes.png" />
 
 </div>

=== modified file 'ubiquity-slideshow/slides/zh_TW/welcome.html'
--- ubiquity-slideshow/slides/zh_TW/welcome.html	2013-03-26 09:15:44 +0000
+++ ubiquity-slideshow/slides/zh_TW/welcome.html	2013-11-11 07:04:47 +0000
@@ -5,14 +5,12 @@
 <div class="text">
 
 <div>
-<p>感謝您選擇UbuntuKylin</p>
-<p>UbuntuKylin是一款專爲中文用戶定制的開源桌面操作系統,我們致力于爲您提供細膩、
-體貼的用戶體驗。</p>
-<p>下面一組幻燈片將爲您介紹目前我們爲中文用戶所做的特色定制。</p>
-</div>
-
-</div>
-
-<img class="background" src="screenshots/welcome.jpg" />
+<p>UbuntuKylin是Ubuntu官方中文衍生版,致力于更有中國味的桌面終端操作系統,爲您提供體貼、細膩的用戶體驗。</p>
+<p>在接下來的時間您將了解到我們爲中文用戶所做的特色定制!</p>
+</div>
+
+</div>
+
+<img class="background" src="screenshots/welcome.png" />
 
 </div>


References