move source of resource properties from UI folder to client folder

move source of resource properties from UI folder to client folder

move source of resource properties from UI folder to client folder

Conflicts:

	build/build-cloud.xml
	build/package.xml
	client/WEB-INF/classes/resources/resource.properties
	client/WEB-INF/classes/resources/resource_zh.properties

build/package.xml

@@ -132,6 +132,9 @@
       <fileset dir="${client.target.dir}">
         <include name="**/*" />
       </fileset>
+      <classes dir="${client.target.dir}">
+    	  <include name="**/resources/*.properties" />
+      </classes>
       <lib dir="${jar.dir}">
         <include name="${core.jar}" />
         <include name="${utils.jar}" />

client/WEB-INF/classes/resources/resource.properties

@@ -0,0 +1,5 @@
+computer = computer
+disk = disk
+computer_disk_hahaha = computer disk hahaha
+monitor = monitor
+keyboard = keyboard

client/WEB-INF/classes/resources/resource_zh.properties

@@ -0,0 +1,5 @@
+computer = 電腦
+disk = 硬碟
+computer_disk_hahaha = 電腦 硬碟 哈哈哈 !!! 
+monitor = 瑩幕
+keyboard = 鍵盤