Index: components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_zh.properties
===================================================================
--- components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_zh.properties	(revision 0)
+++ components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_zh.properties	(revision 0)
@@ -0,0 +1,27 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
+
+## standard actions
+view=\u67e5\u770b
+edit=\u7f16\u8f91
+help=\u5e2e\u52a9
+normal=\u6062\u590d
+minimized=\u6700\u5c0f\u5316
+maximized=\u6700\u5927\u5316
+
+## extended actions
+print=\u6253\u5370
+solo=Solo
Index: components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_zh_TW.properties
===================================================================
--- components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_zh_TW.properties	(revision 0)
+++ components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_zh_TW.properties	(revision 0)
@@ -0,0 +1,27 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
+
+## standard actions
+view=\u67e5\u770b
+edit=\u7de8\u8f2f
+help=\u8aac\u660e
+normal=\u6062\u5fa9
+minimized=\u6700\u5c0f\u5316
+maximized=\u6700\u5927\u5316
+
+## extended actions
+print=\u5217\u5370
+solo=Solo
Index: components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_zh_TW.properties
===================================================================
--- components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_zh_TW.properties	(revision 0)
+++ components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_zh_TW.properties	(revision 0)
@@ -0,0 +1,20 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
+
+login.button=\u767b\u9678
+username.label=\u7528\u6236\u540d: 
+password.label=\u5bc6\u78bc:
Index: applications/j2-admin/src/java/messages_zh.properties
===================================================================
--- applications/j2-admin/src/java/messages_zh.properties	(revision 0)
+++ applications/j2-admin/src/java/messages_zh.properties	(revision 0)
@@ -0,0 +1,38 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
+
+required=\u5fc5\u9700\u7684
+required.java.util.Date=\u5fc5\u9700\u7684\uff0c\u65e5\u671f\u683c\u5f0f\u5982\u4e0b 'MM/dd/yyyy'
+
+typeMismatch=\u65e0\u6548\u6570\u636e
+typeMismatch.java.lang.Integer=\u5fc5\u987b\u662f\u6570\u5b57
+typeMismatch.java.util.Date=\u65e5\u671f\u683c\u5f0f\u5982\u4e0b 'MM/dd/yyyy'
+
+button.home=\u9996\u9875
+button.edit=\u7f16\u8f91
+
+exception.generalError.title=\u4e00\u822c\u9519\u8bef
+
+exception.notAuthorized.title=\u65e0\u8bbf\u95ee\u6743\u9650
+exception.notAuthorized.message=\u4f60\u6ca1\u6709\u6743\u9650\u8bbf\u95ee\u6b64\u533a\u3002
+
+exception.notAvailable.title=\u8d44\u6e90\u4e0d\u53ef\u7528
+exception.notAvailable.message=\u8d44\u6e90\u4e0d\u53ef\u7528\u3002
+
+exception.contactAdmin=\u8bf7\u8054\u7cfb\u7cfb\u7edf\u7ba1\u7406\u5458\u3002
+
+portlet.exceptions.title=Sample Exceptions
+portlet.exceptions.message=This portlet lets you see what uncaught exceptions will look like in your portlet.  Select one of the exceptions below in order to throw it.
Index: applications/j2-admin/src/java/messages_zh_TW.properties
===================================================================
--- applications/j2-admin/src/java/messages_zh_TW.properties	(revision 0)
+++ applications/j2-admin/src/java/messages_zh_TW.properties	(revision 0)
@@ -0,0 +1,38 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
+
+required=\u5fc5\u9700\u7684
+required.java.util.Date=\u5fc5\u9700\u7684\uff0c\u65e5\u671f\u683c\u5f0f\u5982\u4e0b 'MM/dd/yyyy'
+
+typeMismatch=\u7121\u6548\u6578\u64da
+typeMismatch.java.lang.Integer=\u5fc5\u9808\u662f\u6578\u4f4d
+typeMismatch.java.util.Date=\u65e5\u671f\u683c\u5f0f\u5982\u4e0b 'MM/dd/yyyy'
+
+button.home=\u9996\u9801
+button.edit=\u7de8\u8f2f
+
+exception.generalError.title=\u4e00\u822c\u932f\u8aa4
+
+exception.notAuthorized.title=\u7121\u8a2a\u554f\u8a31\u53ef\u6b0a
+exception.notAuthorized.message=\u4f60\u6c92\u6709\u8a31\u53ef\u6b0a\u8a2a\u554f\u6b64\u5340\u3002
+
+exception.notAvailable.title=\u8cc7\u6e90\u4e0d\u53ef\u7528
+exception.notAvailable.message=\u8cc7\u6e90\u4e0d\u53ef\u7528\u3002
+
+exception.contactAdmin=\u8acb\u806f\u7e6b\u7cfb\u7d71\u7ba1\u7406\u54e1\u3002
+
+portlet.exceptions.title=Sample Exceptions
+portlet.exceptions.message=This portlet lets you see what uncaught exceptions will look like in your portlet.  Select one of the exceptions below in order to throw it.
Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_zh.properties
===================================================================
--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_zh.properties	(revision 463096)
+++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_zh.properties	(working copy)
@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
 
 # Messages used by velocity templates and the JetspeedPowerTool
 portal.help.title=\u95e8\u6237\u5728\u7ebf\u5e2e\u52a9
@@ -50,3 +52,15 @@
 portal.page.editing.removeLayout=\u5220\u9664\u5e03\u5c40
 portal.page.editing.moveLayoutDown=\u5411\u4e0b\u79fb\u52a8\u5e03\u5c40
 portal.page.editing.moveLayoutRight=\u5411\u53f3\u79fb\u52a8\u5e03\u5c40
+portal.page.editing.layoutConfiguration=\u5e03\u5c40\u8bbe\u7f6e
+portal.page.editing.pageConfiguration=\u9875\u9762\u8bbe\u7f6e
+portal.page.editing.deleteThisPage=\u5220\u9664\u672c\u9875:
+portal.page.editing.deletePage=\u5220\u9664
+portal.page.editing.confirmDeleteThisPage=\u4f60\u8981\u5220\u9664\u6b64\u9875\u9762\u5417\uff1f
+
+portal.loginform.logout=\u6ce8\u9500
+portal.loginform.login=\u767b\u9646
+portal.loginform.username=\u7528\u6237\u540d:
+portal.loginform.password=\u5bc6  \u7801:
+portal.loginform.change_password=\u66f4\u6539\u5bc6\u7801
+portal.loginform.error.invalid_password=\u5bc6\u7801\u9519\u8bef
Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_zh_TW.properties
===================================================================
--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_zh_TW.properties	(revision 463096)
+++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_zh_TW.properties	(working copy)
@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
 
 # Messages used by velocity templates and the JetspeedPowerTool
 portal.help.title=\u9580\u6236\u7dda\u4e0a\u5e6b\u52a9
@@ -50,3 +52,15 @@
 portal.page.editing.removeLayout=\u522a\u9664\u4f48\u5c40
 portal.page.editing.moveLayoutDown=\u5411\u4e0b\u79fb\u52d5\u4f48\u5c40
 portal.page.editing.moveLayoutRight=\u5411\u53f3\u79fb\u52d5\u4f48\u5c40
+portal.page.editing.layoutConfiguration=\u4f48\u5c40\u8a2d\u7f6e
+portal.page.editing.pageConfiguration=\u9801\u9762\u8a2d\u7f6e
+portal.page.editing.deleteThisPage=\u522a\u9664\u672c\u9801:
+portal.page.editing.deletePage=\u522a\u9664
+portal.page.editing.confirmDeleteThisPage=\u4f60\u8981\u522a\u9664\u6b64\u9801\u9762\u55ce\uff1f
+
+portal.loginform.logout=\u8a3b\u92b7
+portal.loginform.login=\u767b\u9678
+portal.loginform.username=\u7528\u6236\u540d:
+portal.loginform.password=\u5bc6  \u78bc:
+portal.loginform.change_password=\u66f4\u6539\u5bc6\u78bc
+portal.loginform.error.invalid_password=\u5bc6\u78bc\u932f\u8aa4
Index: layout-portlets/src/webapp/WEB-INF/portlet.xml
===================================================================
--- layout-portlets/src/webapp/WEB-INF/portlet.xml	(revision 463096)
+++ layout-portlets/src/webapp/WEB-INF/portlet.xml	(working copy)
@@ -581,6 +581,8 @@
 <portlet id="VelocityFourColumns">
     <portlet-name>VelocityFourColumns</portlet-name>
     <display-name>Four Layout Using Velocity</display-name>
+    <display-name xml:lang="zh">基于Velocity表格的4列布局</display-name>
+    <display-name xml:lang="zh-TW">基於Velocity表格的4列佈局</display-name>
     <init-param>
       <name>ViewPage</name>
       <value>columns</value>
Index: src/webapp/desktop-themes/sky/resources/Messages_zh.properties
===================================================================
--- src/webapp/desktop-themes/sky/resources/Messages_zh.properties	(revision 0)
+++ src/webapp/desktop-themes/sky/resources/Messages_zh.properties	(revision 0)
@@ -0,0 +1,22 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
+
+portal.loginform.logout=\u6ce8\u9500
+portal.loginform.login=\u767b\u9646
+portal.loginform.username=\u7528\u6237\u540d:
+portal.loginform.password=\u5bc6\u7801:
+portal.loginform.change_password=\u66f4\u6539\u5bc6\u7801
+portal.loginform.error.invalid_password=\u5bc6\u7801\u9519\u8bef
Index: src/webapp/desktop-themes/sky/resources/Messages_zh_TW.properties
===================================================================
--- src/webapp/desktop-themes/sky/resources/Messages_zh_TW.properties	(revision 0)
+++ src/webapp/desktop-themes/sky/resources/Messages_zh_TW.properties	(revision 0)
@@ -0,0 +1,22 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# LOCALIZATION MAINTAINER:
+#  Cubehead Fang <cubehead@gmail.com>
+
+portal.loginform.logout=\u8a3b\u92b7
+portal.loginform.login=\u767b\u9678
+portal.loginform.username=\u7528\u6236\u540d:
+portal.loginform.password=\u5bc6\u78bc:
+portal.loginform.change_password=\u66f4\u6539\u5bc6\u78bc
+portal.loginform.error.invalid_password=\u5bc6\u78bc\u932f\u8aa4