diff --git a/oss/joomla/trunk/administrator/cache/b1f3ab3f0c3282ec2b2d60caebd1f4e7.spc b/oss/joomla/trunk/administrator/cache/b1f3ab3f0c3282ec2b2d60caebd1f4e7.spc
index f5353f56..cdb2977b 100644
--- a/oss/joomla/trunk/administrator/cache/b1f3ab3f0c3282ec2b2d60caebd1f4e7.spc
+++ b/oss/joomla/trunk/administrator/cache/b1f3ab3f0c3282ec2b2d60caebd1f4e7.spc
@@ -29,7 +29,7 @@ a:4:{s:5:"child";a:1:{s:0:"";a:1:{s:3:"rss";a:1:{i:0;a:6:{s:4:"data";s:4:"
     
     
     
-  ";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";s:5:"child";a:3:{s:0:"";a:9:{s:5:"title";a:1:{i:0;a:5:{s:4:"data";s:25:"OSS 计算技术 - Joomla";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:4:"link";a:1:{i:0;a:5:{s:4:"data";s:57:"http://forums.hawebs.net/computer/forumdisplay.php?fid=37";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:11:"description";a:1:{i:0;a:5:{s:4:"data";s:27:"Latest 20 threads of Joomla";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:9:"copyright";a:1:{i:0;a:5:{s:4:"data";s:29:"Copyright(C) OSS 计算技术";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:9:"generator";a:1:{i:0;a:5:{s:4:"data";s:13:"HX WEBSYSTEMS";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:13:"lastBuildDate";a:1:{i:0;a:5:{s:4:"data";s:31:"Tue, 22 Jun 2010 21:04:46 +0000";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:3:"ttl";a:1:{i:0;a:5:{s:4:"data";s:2:"30";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:5:"image";a:1:{i:0;a:6:{s:4:"data";s:26:"
+  ";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";s:5:"child";a:3:{s:0:"";a:9:{s:5:"title";a:1:{i:0;a:5:{s:4:"data";s:25:"OSS 计算技术 - Joomla";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:4:"link";a:1:{i:0;a:5:{s:4:"data";s:57:"http://forums.hawebs.net/computer/forumdisplay.php?fid=37";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:11:"description";a:1:{i:0;a:5:{s:4:"data";s:27:"Latest 20 threads of Joomla";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:9:"copyright";a:1:{i:0;a:5:{s:4:"data";s:29:"Copyright(C) OSS 计算技术";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:9:"generator";a:1:{i:0;a:5:{s:4:"data";s:13:"HX WEBSYSTEMS";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:13:"lastBuildDate";a:1:{i:0;a:5:{s:4:"data";s:31:"Wed, 23 Jun 2010 01:01:42 +0000";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:3:"ttl";a:1:{i:0;a:5:{s:4:"data";s:2:"30";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:5:"image";a:1:{i:0;a:6:{s:4:"data";s:26:"
       
       
       
@@ -352,4 +352,4 @@ http://www.afactory.org/downloads[/url]
 
 716[/attach]
 <p><a href="http://feedads.g.doubleclick.net/~a/YyJgtiqdRC6I37RmOJ26D_P-vN0/0/da"><img src="http://feedads.g.doubleclick.net/~a/YyJgtiqdRC6I37RmOJ26D_P-vN0/0/di" border="0" ismap="true"></img></a><br/>
-<a href="http://feedads.g.doubleclick.net/~a/YyJgtiqdRC6I37RmOJ26D_P-vN0/1/da"><img src="http://feedads.g.doubleclick.net/~a/YyJgtiqdRC6I37RmOJ26D_P-vN0/1/di" border="0" ismap="true"></img></a></p><img src="http://feeds.feedburner.com/~r/Moose-Joomla/~4/f4sk7cjNIjc" height="1" width="1"/>";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:8:"category";a:1:{i:0;a:5:{s:4:"data";s:6:"Joomla";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:6:"author";a:1:{i:0;a:5:{s:4:"data";s:10:"honeymoose";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:7:"pubDate";a:1:{i:0;a:5:{s:4:"data";s:31:"Thu, 15 Apr 2010 18:36:14 +0000";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}}}}}}s:27:"http://www.w3.org/2005/Atom";a:1:{s:4:"link";a:2:{i:0;a:5:{s:4:"data";s:0:"";s:7:"attribs";a:1:{s:0:"";a:3:{s:3:"rel";s:4:"self";s:4:"type";s:19:"application/rss+xml";s:4:"href";s:40:"http://feeds.feedburner.com/Moose-Joomla";}}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}i:1;a:5:{s:4:"data";s:0:"";s:7:"attribs";a:1:{s:0:"";a:2:{s:3:"rel";s:3:"hub";s:4:"href";s:32:"http://pubsubhubbub.appspot.com/";}}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}}s:42:"http://rssnamespace.org/feedburner/ext/1.0";a:1:{s:4:"info";a:1:{i:0;a:5:{s:4:"data";s:0:"";s:7:"attribs";a:1:{s:0:"";a:1:{s:3:"uri";s:12:"moose-joomla";}}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}}}}}}}}}}}s:4:"type";i:128;s:7:"headers";a:10:{s:13:"last-modified";s:29:"Tue, 22 Jun 2010 21:04:47 GMT";s:4:"etag";s:27:"HBzjnVirg3msWUDoUYHThIPxLCc";s:12:"content-type";s:23:"text/xml; charset=UTF-8";s:4:"date";s:29:"Tue, 22 Jun 2010 21:04:47 GMT";s:7:"expires";s:29:"Tue, 22 Jun 2010 21:04:47 GMT";s:13:"cache-control";s:18:"private, max-age=0";s:22:"x-content-type-options";s:7:"nosniff";s:16:"x-xss-protection";s:13:"1; mode=block";s:6:"server";s:3:"GSE";s:17:"transfer-encoding";s:7:"chunked";}s:5:"build";s:14:"20090627192103";}
\ No newline at end of file
+<a href="http://feedads.g.doubleclick.net/~a/YyJgtiqdRC6I37RmOJ26D_P-vN0/1/da"><img src="http://feedads.g.doubleclick.net/~a/YyJgtiqdRC6I37RmOJ26D_P-vN0/1/di" border="0" ismap="true"></img></a></p><img src="http://feeds.feedburner.com/~r/Moose-Joomla/~4/f4sk7cjNIjc" height="1" width="1"/>";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:8:"category";a:1:{i:0;a:5:{s:4:"data";s:6:"Joomla";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:6:"author";a:1:{i:0;a:5:{s:4:"data";s:10:"honeymoose";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}s:7:"pubDate";a:1:{i:0;a:5:{s:4:"data";s:31:"Thu, 15 Apr 2010 18:36:14 +0000";s:7:"attribs";a:0:{}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}}}}}}s:27:"http://www.w3.org/2005/Atom";a:1:{s:4:"link";a:2:{i:0;a:5:{s:4:"data";s:0:"";s:7:"attribs";a:1:{s:0:"";a:3:{s:3:"rel";s:4:"self";s:4:"type";s:19:"application/rss+xml";s:4:"href";s:40:"http://feeds.feedburner.com/Moose-Joomla";}}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}i:1;a:5:{s:4:"data";s:0:"";s:7:"attribs";a:1:{s:0:"";a:2:{s:3:"rel";s:3:"hub";s:4:"href";s:32:"http://pubsubhubbub.appspot.com/";}}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}}s:42:"http://rssnamespace.org/feedburner/ext/1.0";a:1:{s:4:"info";a:1:{i:0;a:5:{s:4:"data";s:0:"";s:7:"attribs";a:1:{s:0:"";a:1:{s:3:"uri";s:12:"moose-joomla";}}s:8:"xml_base";s:0:"";s:17:"xml_base_explicit";b:0;s:8:"xml_lang";s:0:"";}}}}}}}}}}}}s:4:"type";i:128;s:7:"headers";a:10:{s:13:"last-modified";s:29:"Wed, 23 Jun 2010 01:01:46 GMT";s:4:"etag";s:27:"Jzi5nO5HEoxVfQgMaWiJs2x81fE";s:12:"content-type";s:23:"text/xml; charset=UTF-8";s:4:"date";s:29:"Wed, 23 Jun 2010 01:01:46 GMT";s:7:"expires";s:29:"Wed, 23 Jun 2010 01:01:46 GMT";s:13:"cache-control";s:18:"private, max-age=0";s:22:"x-content-type-options";s:7:"nosniff";s:16:"x-xss-protection";s:13:"1; mode=block";s:6:"server";s:3:"GSE";s:17:"transfer-encoding";s:7:"chunked";}s:5:"build";s:14:"20090627192103";}
\ No newline at end of file
diff --git a/oss/joomla/trunk/administrator/language/en-GB/_notes/dwsync.xml b/oss/joomla/trunk/administrator/language/en-GB/_notes/dwsync.xml
new file mode 100644
index 00000000..2c932028
--- /dev/null
+++ b/oss/joomla/trunk/administrator/language/en-GB/_notes/dwsync.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<dwsync>
+<file name="en-GB.com_admin.ini" server="hawebs.net//www/hawebs.net/news/" local="129211079280000000" remote="129220045200000000" />
+<file name="en-GB.com_cache.ini" server="hawebs.net//www/hawebs.net/news/" local="129212798234531250" remote="129220045200000000" />
+<file name="en-GB.mod_feed.ini" server="hawebs.net//www/hawebs.net/news/" local="129212798251562500" remote="129220045200000000" />
+<file name="en-GB.plg_editors_tinymce.ini" server="hawebs.net//www/hawebs.net/news/" local="129211890526406250" remote="129220045200000000" />
+<file name="en-GB.plg_xmlrpc_blogger.ini" server="hawebs.net//www/hawebs.net/news/" local="129212798262656250" remote="129220045200000000" />
+</dwsync>
\ No newline at end of file
diff --git a/oss/joomla/trunk/administrator/language/zh-CN/_notes/dwsync.xml b/oss/joomla/trunk/administrator/language/zh-CN/_notes/dwsync.xml
new file mode 100644
index 00000000..9eac4be4
--- /dev/null
+++ b/oss/joomla/trunk/administrator/language/zh-CN/_notes/dwsync.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<dwsync>
+<file name="zh-CN.com_admin.ini" server="hawebs.net//www/hawebs.net/news/" local="129217149484218750" remote="129220045800000000" />
+<file name="zh-CN.com_apoll.ini" server="hawebs.net//www/hawebs.net/news/" local="129211078465781250" remote="129220045800000000" />
+<file name="zh-CN.com_apoll.menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211082339218750" remote="129220045800000000" />
+<file name="zh-CN.com_attachments.ini" server="hawebs.net//www/hawebs.net/news/" local="129211081889531250" remote="129220045800000000" />
+<file name="zh-CN.com_attachments.menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211082238437500" remote="129220045800000000" />
+<file name="zh-CN.com_cache.ini" server="hawebs.net//www/hawebs.net/news/" local="129211203049218750" remote="129220045800000000" />
+<file name="zh-CN.com_newsfeeds.ini" server="hawebs.net//www/hawebs.net/news/" local="129220079527656250" remote="129220045800000000" />
+<file name="zh-CN.com_newsfeeds.menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129220079605781250" remote="129220045800000000" />
+<file name="zh-CN.ini" server="hawebs.net//www/hawebs.net/news/" local="129220026303906250" remote="129220045800000000" />
+<file name="zh-CN.mod_menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211202126093750" remote="129220045800000000" />
+<file name="zh-CN.mod_quickicon.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914990625000" remote="129220045800000000" />
+<file name="zh-CN.mod_stats.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914948281250" remote="129220045800000000" />
+<file name="zh-CN.mod_status.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914895625000" remote="129220045800000000" />
+<file name="zh-CN.mod_submenu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914870625000" remote="129220045800000000" />
+<file name="zh-CN.mod_title.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913854218750" remote="129220045800000000" />
+<file name="zh-CN.mod_toolbar.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913812812500" remote="129220045800000000" />
+<file name="zh-CN.mod_unread.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913780312500" remote="129220045800000000" />
+<file name="zh-CN.plg_authentication_example.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913738750000" remote="129220045800000000" />
+<file name="zh-CN.plg_authentication_gmail.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913662968750" remote="129220045800000000" />
+<file name="zh-CN.plg_authentication_joomla.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913622968750" remote="129220045800000000" />
+<file name="zh-CN.plg_authentication_ldap.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913551562500" remote="129220045800000000" />
+<file name="zh-CN.plg_authentication_openid.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913510781250" remote="129220045800000000" />
+<file name="zh-CN.plg_content_code.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912956250000" remote="129220045800000000" />
+<file name="zh-CN.plg_content_emailcloak.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912912812500" remote="129220045800000000" />
+<file name="zh-CN.plg_content_geshi.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912877031250" remote="129220045800000000" />
+<file name="zh-CN.plg_content_image.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912838437500" remote="129220045800000000" />
+<file name="zh-CN.plg_content_loadmodule.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912790468750" remote="129220045800000000" />
+<file name="zh-CN.plg_content_pagebreak.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912742812500" remote="129220045800000000" />
+<file name="zh-CN.plg_content_pagenavigation.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912700937500" remote="129220045800000000" />
+<file name="zh-CN.plg_content_vote.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912654062500" remote="129220045800000000" />
+<file name="zh-CN.plg_editors-xtd_image.ini" server="hawebs.net//www/hawebs.net/news/" local="129211888982343750" remote="129220045800000000" />
+<file name="zh-CN.plg_editors-xtd_pagebreak.ini" server="hawebs.net//www/hawebs.net/news/" local="129211888320156250" remote="129220045800000000" />
+<file name="zh-CN.plg_editors-xtd_readmore.ini" server="hawebs.net//www/hawebs.net/news/" local="129211887965937500" remote="129220045800000000" />
+<file name="zh-CN.plg_editors_none.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912618125000" remote="129220045800000000" />
+<file name="zh-CN.plg_editors_tinymce.ini" server="hawebs.net//www/hawebs.net/news/" local="129211911153437500" remote="129220045800000000" />
+<file name="zh-CN.plg_editors_xstandard.ini" server="hawebs.net//www/hawebs.net/news/" local="129211889195000000" remote="129220045800000000" />
+<file name="zh-CN.plg_search_categories.ini" server="hawebs.net//www/hawebs.net/news/" local="129211887495937500" remote="129220045800000000" />
+<file name="zh-CN.plg_search_contacts.ini" server="hawebs.net//www/hawebs.net/news/" local="129211887302500000" remote="129220045800000000" />
+<file name="zh-CN.plg_search_content.ini" server="hawebs.net//www/hawebs.net/news/" local="129211886892812500" remote="129220045800000000" />
+<file name="zh-CN.plg_search_newsfeeds.ini" server="hawebs.net//www/hawebs.net/news/" local="129211886764531250" remote="129220045800000000" />
+<file name="zh-CN.plg_search_sections.ini" server="hawebs.net//www/hawebs.net/news/" local="129211885976718750" remote="129220045800000000" />
+<file name="zh-CN.plg_search_weblinks.ini" server="hawebs.net//www/hawebs.net/news/" local="129211885545625000" remote="129220045800000000" />
+<file name="zh-CN.plg_system_backlink.ini" server="hawebs.net//www/hawebs.net/news/" local="129211799193906250" remote="129220045800000000" />
+<file name="zh-CN.plg_system_cache.ini" server="hawebs.net//www/hawebs.net/news/" local="129211796943906250" remote="129220045800000000" />
+<file name="zh-CN.plg_system_debug.ini" server="hawebs.net//www/hawebs.net/news/" local="129211796133906250" remote="129220045800000000" />
+<file name="zh-CN.plg_system_legacy.ini" server="hawebs.net//www/hawebs.net/news/" local="129211794988750000" remote="129220045800000000" />
+<file name="zh-CN.plg_system_sef.ini" server="hawebs.net//www/hawebs.net/news/" local="129211794435937500" remote="129220045800000000" />
+<file name="zh-CN.plg_user_joomla.ini" server="hawebs.net//www/hawebs.net/news/" local="129211793524062500" remote="129220045800000000" />
+<file name="zh-CN.plg_xmlrpc_blogger.ini" server="hawebs.net//www/hawebs.net/news/" local="129211792516406250" remote="129220045800000000" />
+<file name="zh-CN.plg_xmlrpc_joomla.ini" server="hawebs.net//www/hawebs.net/news/" local="129211792923125000" remote="129220045800000000" />
+<file name="zh-CN.xml" server="hawebs.net//www/hawebs.net/news/" local="129217135427500000" remote="129220045800000000" />
+</dwsync>
\ No newline at end of file
diff --git a/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.ini b/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.ini
index d37233ef..9854a948 100644
--- a/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.ini
+++ b/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.ini
@@ -1,72 +1,92 @@
-# version 1.5.0 2008-01-14 17:37:23 ~0
-# author Joomla! Chinese Translation Team
-# copyright (C) 2005 Open Source Matters. All rights reserved.
-# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
-# Note : All ini files need to be saved as UTF-8
+#/**
+# * Copyright (C) 2006-2010 YUCHENG HU
+# *
+# * ---------------------------------------------
+# * HA WEBSYSTEMS
+# * http://www.hawebs.net
+# * https://www.hawebs.org/forums/computer/
+# *
+# * CONTACT
+# * huyuchengus@gmail.com / yuchenghu@hawebs.net
+# * 
+# * ---------------------------------------------
+# * GNU GENERAL PUBLIC LICENSE GNU/LGPL
+# * http://www.gnu.org/licenses/lgpl.html
+# *
+# * ---------------------------------------------
+# * NOTE
+# * 1. 所有的 ini 文件必须采用 UTF-8 编码
+# * 2. 请不要在语言配置文件中使用单引号或双引号  (' 或 ") 
+# *
+# * ---------------------------------------------
+# */
 
-A FEED=一个新闻联播源
+A FEED=一个聚合新闻地址
 ALIGNMENT OF THE IMAGE=图片的对齐方式
 CACHE DIRECTORY=缓存目录
 CACHE TIME=缓存时间
 CATEGORY DESCRIPTION=分类说明
 CATEGORIES GROUP=所有分类
-CATEGORIES GROUP DESC=该页面显示所有联播新闻的分类。
+CATEGORIES GROUP DESC=该页面显示所有聚合新闻的分类。
 CATEGORY GROUP=分类
-CATEGORY GROUP DESC=该页面显示新闻联播的一个分类。
+CATEGORY GROUP DESC=该页面显示聚合新闻的一个分类。
 CATEGORY LIST - CATEGORY=分类列表 - 分类
 CATEGORY LIST - SECTION=分类列表 - 单元
-CHANGES TO NEWSFEED SAVED=已保存对新闻联播所作的修改
+CHANGES TO NEWSFEED SAVED=已保存对聚合新闻所作的修改
 DESCNEWITEMSLAST=新增条目默认添加在最后面，您可以在条目保存后更改排列顺序。
 DESCRIPTION FOR PAGE=页面说明
 DESCRIPTION TEXT=说明
-EDIT NEWSFEED=编辑新闻联播
-FEED=联播新闻
-FEED DESCRIPTION=联播新闻的说明
+EDIT NEWSFEED=编辑聚合新闻
+FEED=聚合新闻
+FEED DESCRIPTION=聚合新闻的说明
 IMAGE ALIGN=图片对齐方式
-INDIVIDUAL FEED GROUP=单个联播新闻（新闻联播源）
-INDIVIDUAL FEED GROUP DESC=这个页面显示一个联播新闻（新闻联播源）。
+INDIVIDUAL FEED GROUP=单个聚合新闻（聚合新闻源）
+INDIVIDUAL FEED GROUP DESC=这个页面显示一个聚合新闻（聚合新闻源）。
 ITEM DESCRIPTION=条目的说明
+LEFT TO RIGHT DIRECTION=从左到右
 LINK=链接
 LINK COLUMN=链接栏
 NAME COLUMN=名称栏
-NEWS FEED=联播新闻的名称
-NEWSFEED=新闻联播
+NEWS FEED=聚合新闻的名称
+NEWSFEED=聚合新闻
 NEWSFEED CATEGORY LAYOUT=分类的版面
-NEWSFEED CATEGORY LAYOUT DESC=该版面显示一个分类里的联播新闻（新闻联播源）的列表。
+NEWSFEED CATEGORY LAYOUT DESC=该版面显示一个分类里的聚合新闻（聚合新闻源）的列表。
 NEWSFEED CATEGORY LIST LAYOUT=分类的列表的版面
-NEWSFEED CATEGORY LIST LAYOUT DESC=该版面显示了所有新闻联播的分类的列表。
-NEWSFEED LAYOUT=新闻联播的版面
-NEWSFEED MANAGER=新闻联播管理
-NEWSFEED SINGLE LAYOUT=单个联播新闻（新闻联播源）的版面
-NEWSFEED SINGLE LAYOUT DESC=该版面显示一个联播新闻（新闻联播源）。
-NEWSFEED SAVED=已保存新闻联播
+NEWSFEED CATEGORY LIST LAYOUT DESC=该版面显示了所有聚合新闻的分类的列表。
+NEWSFEED LAYOUT=聚合新闻的版面
+NEWSFEED MANAGER=聚合新闻管理
+NEWSFEED SINGLE LAYOUT=单个聚合新闻（聚合新闻源）的版面
+NEWSFEED SINGLE LAYOUT DESC=该版面显示一个聚合新闻（聚合新闻源）。
+NEWSFEED SAVED=已保存聚合新闻
 NUM CATEGORY ITEMS=该分类的条目数
 NUM ARTICLES=文章数
 NUM ARTICLES COLUMN=文章栏
 NUMBER OF ARTICLES=文章数量
-PARAMARTICLES=显示或隐藏联播新闻（新闻联播源）中的文章数
+PARAMARTICLES=显示或隐藏聚合新闻（聚合新闻源）中的文章数
 PARAMCATDESC=显示或隐藏分类说明
-PARAMCATSELECT=新闻联播的一个分类（可选）
+PARAMCATSELECT=聚合新闻的一个分类（可选）
 PARAMCATITEMS=显示或隐藏各个分类中的条目数量
-PARAMFEEDDESC=显示或隐藏新闻联播源（RSS Feed）的说明
+PARAMFEEDDESC=显示或隐藏聚合新闻（RSS Feed）的说明
 PARAMIMAGE=页面图片，图片需放置于/images/stories文件夹中。默认使用图片web_links.jpg，无图片则意味着不调用任何图片
 PARAMITEMDESC=显示或隐藏条目的简介或引言
 PARAMOTHERCAT=在目录式排版浏览页显示或隐藏分类列表
 PARAMOTHERCATSECTION=在列表浏览页显示或隐藏分类列表
 PARAMWORDCOUNT=允许您限制新闻简介的字数，如为数字0则显示所有文字简介
 PLEASE FILL IN THE CACHE REFRESH TIME.=请填写缓存的更新时间。
-PLEASE FILL IN THE NEWSFEED LINK.=请填写新闻联播的链接。
-PLEASE FILL IN THE NEWSFEED NAME.=请填写新闻联播的名称。
-PLEASE SELECT A FEED=请选择新闻联播源
+PLEASE FILL IN THE NEWSFEED LINK.=请填写聚合新闻的链接。
+PLEASE FILL IN THE NEWSFEED NAME.=请填写聚合新闻的名称。
+PLEASE SELECT A FEED=请选择聚合新闻源
 RTL FEED=RTL新闻源
-SELECT FEED=选择联播新闻（新闻联播源）
+RIGHT TO LEFT DIRECTION=从右到左
+SELECT FEED=选择聚合新闻（聚合新闻源）
 SHOW/HIDE THE DESCRIPTION BELOW=显示或隐藏以下说明
-SHOW/HIDE THE FEED LINK COLUMN=显示或隐藏联播新闻（新闻联播源）的链接栏
-SHOW/HIDE THE FEED NAME COLUMN=显示或隐藏联播新闻（新闻联播源）的名称栏
-SHOW/HIDE THE IMAGE OF THE FEED=显示或隐藏为联播新闻（新闻联播源）配置的插图
+SHOW/HIDE THE FEED LINK COLUMN=显示或隐藏聚合新闻（聚合新闻源）的链接栏
+SHOW/HIDE THE FEED NAME COLUMN=显示或隐藏聚合新闻（聚合新闻源）的名称栏
+SHOW/HIDE THE IMAGE OF THE FEED=显示或隐藏为聚合新闻（聚合新闻源）配置的插图
 SHOW LIMIT BOX=显示限制框
 SHOW/HIDE THE LIMIT BOX=显示或隐藏限制框
 SHOW/HIDE THE TABLE HEADINGS=显示或隐藏表头
+SITE LANGUAGE DIRECTION=网站默认
 TABLE HEADINGS=表头
 THIS COMPONENT MANAGES RSS/RDF NEWSFEEDS=这个组件管理RSS/RDF新闻联播，让本站可以分享其它网站的新闻（文章）
 TIPCACHETIME=新闻联播缓存刷新的时间（单位：分钟）。
diff --git a/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.menu.ini b/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.menu.ini
index 47068370..8d89586e 100644
--- a/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.menu.ini
+++ b/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_newsfeeds.menu.ini
@@ -1,12 +1,26 @@
-# version 1.5.0 2008-01-14 17:00:17 ~0
-# author Joomla! Chinese Translation Team
-# copyright (C) 2005 Open Source Matters. All rights reserved.
-# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+#/**
+# * Copyright (C) 2006-2010 YUCHENG HU
+# *
+# * ---------------------------------------------
+# * HA WEBSYSTEMS
+# * http://www.hawebs.net
+# * https://www.hawebs.org/forums/computer/
+# *
+# * CONTACT
+# * huyuchengus@gmail.com / yuchenghu@hawebs.net
+# * 
+# * ---------------------------------------------
+# * GNU GENERAL PUBLIC LICENSE GNU/LGPL
+# * http://www.gnu.org/licenses/lgpl.html
+# *
+# * ---------------------------------------------
+# * NOTE
+# * 1. 所有的 ini 文件必须采用 UTF-8 编码
+# * 2. 请不要在语言配置文件中使用单引号或双引号  (' 或 ") 
+# *
+# * ---------------------------------------------
+# */
 
-# Note : All ini files need to be saved as UTF-8
-
-
-
-COM_NEWSFEEDS=新闻联播
-COM_NEWSFEEDS.FEEDS=新闻联播源
-COM_NEWSFEEDS.CATEGORIES=新闻联播分类
+COM_NEWSFEEDS=聚合新闻
+COM_NEWSFEEDS.FEEDS=聚合新闻
+COM_NEWSFEEDS.CATEGORIES=聚合新闻分类
diff --git a/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.ini b/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.ini
index 32ef8f5e..d34199cf 100644
--- a/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.ini
+++ b/oss/joomla/trunk/administrator/language/zh-CN/zh-CN.ini
@@ -80,7 +80,7 @@ FRIDAY=周五
 (TODAY)= （今天）
 (SHIFT-)CLICK OR DRAG TO CHANGE VALUE=Shift+点击或拖曳来改变数值。
 ABOUT THE CALENDAR=关于日历
-DISPLAY %S FIRST=首先显示%s
+DISPLAY %S FIRST=首先显示 %s
 DRAG TO MOVE=用鼠标拖曳移动
 GO TODAY=转至今天
 NEXT MONTH (HOLD FOR MENU)=点击移至下个月。按下左键并保持可以看到月份列表。
diff --git a/oss/joomla/trunk/templates/hawebs/images/_notes/dwsync.xml b/oss/joomla/trunk/templates/hawebs/images/_notes/dwsync.xml
new file mode 100644
index 00000000..97a6d017
--- /dev/null
+++ b/oss/joomla/trunk/templates/hawebs/images/_notes/dwsync.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<dwsync>
+<file name="arrow.png" server="hawebs.net//www/hawebs.net/news/" local="129003909125150000" remote="129217266600000000" />
+<file name="indent1.png" server="hawebs.net//www/hawebs.net/news/" local="129003909124520000" remote="129217266600000000" />
+<file name="indent2.png" server="hawebs.net//www/hawebs.net/news/" local="129003909123430000" remote="129217266600000000" />
+<file name="indent3.png" server="hawebs.net//www/hawebs.net/news/" local="129003909122800000" remote="129217266600000000" />
+<file name="indent4.png" server="hawebs.net//www/hawebs.net/news/" local="129003909122020000" remote="129217266600000000" />
+<file name="index.html" server="hawebs.net//www/hawebs.net/news/" local="129003909120770000" remote="129217266600000000" />
+<file name="login-bg.gif" server="hawebs.net//www/hawebs.net/news/" local="129003909119990000" remote="129217266600000000" />
+<file name="mw_content_b.png" server="hawebs.net//www/hawebs.net/news/" local="129003909118430000" remote="129217266600000000" />
+<file name="mw_content_b_l.png" server="hawebs.net//www/hawebs.net/news/" local="129003909118430000" remote="129217266600000000" />
+<file name="mw_content_b_r.png" server="hawebs.net//www/hawebs.net/news/" local="129003909116710000" remote="129217266600000000" />
+<file name="mw_content_t.png" server="hawebs.net//www/hawebs.net/news/" local="129003909116870000" remote="129217266600000000" />
+<file name="mw_content_t_l.png" server="hawebs.net//www/hawebs.net/news/" local="129003909115150000" remote="129217266600000000" />
+<file name="mw_content_t_r.png" server="hawebs.net//www/hawebs.net/news/" local="129003909114990000" remote="129217266600000000" />
+<file name="mw_footer_separator.png" server="hawebs.net//www/hawebs.net/news/" local="129003909112800000" remote="129217266600000000" />
+<file name="mw_header.jpg" server="hawebs.net//www/hawebs.net/news/" local="129003909113430000" remote="129217266600000000" />
+<file name="mw_header_b.png" server="hawebs.net//www/hawebs.net/news/" local="129003909111240000" remote="129217266600000000" />
+<file name="mw_header_l_b.png" server="hawebs.net//www/hawebs.net/news/" local="129003909110460000" remote="129217266600000000" />
+<file name="mw_header_r_b.png" server="hawebs.net//www/hawebs.net/news/" local="129003909109680000" remote="129217266600000000" />
+<file name="mw_joomla_logo.png" server="hawebs.net//www/hawebs.net/news/" local="129156887050000000" remote="129217267200000000" />
+<file name="mw_line_grey.png" server="hawebs.net//www/hawebs.net/news/" local="129003909108120000" remote="129217267200000000" />
+<file name="mw_menu_cap_l.png" server="hawebs.net//www/hawebs.net/news/" local="129003909106710000" remote="129217267200000000" />
+<file name="mw_menu_cap_r.png" server="hawebs.net//www/hawebs.net/news/" local="129003909106550000" remote="129217267200000000" />
+<file name="mw_menu_normal_bg.png" server="hawebs.net//www/hawebs.net/news/" local="129003909104520000" remote="129217267200000000" />
+<file name="mw_menu_separator.png" server="hawebs.net//www/hawebs.net/news/" local="129003909104520000" remote="129217267200000000" />
+<file name="mw_readon.png" server="hawebs.net//www/hawebs.net/news/" local="129003909092180000" remote="129217267200000000" />
+<file name="mw_readon_rtl.png" server="hawebs.net//www/hawebs.net/news/" local="129003909090300000" remote="129217267200000000" />
+<file name="spacer.png" server="hawebs.net//www/hawebs.net/news/" local="129003909088740000" remote="129217267200000000" />
+<file name="trans.gif" server="hawebs.net//www/hawebs.net/news/" local="129003908679371250" remote="129217267200000000" />
+</dwsync>
\ No newline at end of file
diff --git a/oss/joomla/trunk/templates/hawebs/images/trans.gif b/oss/joomla/trunk/templates/hawebs/images/trans.gif
new file mode 100644
index 00000000..c7bee69b
Binary files /dev/null and b/oss/joomla/trunk/templates/hawebs/images/trans.gif differ