From 17b6a4e49d28864539554707199100f4e6a5ce30 Mon Sep 17 00:00:00 2001
From: "Manuel Amador (Rudd-O)" <rudd-o@rudd-o.com>
Date: Fri, 20 Aug 2010 12:27:14 -0700
Subject: [PATCH] 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                                       | 3 +++
 client/WEB-INF/classes/resources/resource.properties    | 5 +++++
 client/WEB-INF/classes/resources/resource_zh.properties | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 client/WEB-INF/classes/resources/resource.properties
 create mode 100644 client/WEB-INF/classes/resources/resource_zh.properties

diff --git a/build/package.xml b/build/package.xml
index 7a2f28304bb..160c648287f 100755
--- a/build/package.xml
+++ b/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}" />
diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
new file mode 100644
index 00000000000..b7a3baead51
--- /dev/null
+++ b/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
diff --git a/client/WEB-INF/classes/resources/resource_zh.properties b/client/WEB-INF/classes/resources/resource_zh.properties
new file mode 100644
index 00000000000..948c8e13203
--- /dev/null
+++ b/client/WEB-INF/classes/resources/resource_zh.properties
@@ -0,0 +1,5 @@
+computer = 電腦
+disk = 硬碟
+computer_disk_hahaha = 電腦 硬碟 哈哈哈 !!! 
+monitor = 瑩幕
+keyboard = 鍵盤