diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index e9f563a5947..ac6bb99774a 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -1,22 +1,62 @@
+actions = Actions
+add = Add
+help = Help
+advanced = Advanced
+version = Version
+
+dashboard = Dashboard
+instance = Instance
+router = Router
+storage = Storage
+volume = Volume
+snapshot = Snapshot
+ip.address = IP Address
+template = Template
+my.template = My Template
+featured.template = Featured Template
+community.template = Community Template
+iso = ISO
+my.iso = My ISO
+featured.iso = Featured ISO
+community.iso = Community ISO
+account = Account
+domain = Domain
+event = Event
+alert = Alert
+
+
+
+name = Name
+display.text = Display Text
+os.type = OS Type
+public = Public
+instance.name = Instance Name
+group.name = Group Name
+service.offering = Service Offering
+password.enabled = Password Enabled
+instance.limit = Instance Limit
+public.ip.limit = Public IP Limit
+disk.volume.limit = Disk Volume Limit
+snapshot.limit = Snapshot Limit
+template.limit = Template Limit
+URL = URL
+zone = Zone
+bootable = Bootable
+group = Group
+
+disk.offering = Disk Offering
+copy.ISO.to = Copy ISO to
+no.available.iso = No Available ISO
+
your.session.has.expired = Your session has expired
internet.name.can.not.be.resolved = Internet name can not be resolved
management.server.is.not.accessible = Management server is not accessible
please.confirm.you.want.to.detach.an.iso.from.the.virtual.machine = Please confirm you want to detach an ISO from the virtual machine
please.specify.the.iso.you.wish.to.attach.to.virtual.machine = Please specify the ISO you wish to attach to virtual instance
-iso = ISO
-no.available.iso = No Available ISO
please.specify.the.new.name.you.want.to.change.for.the.virtual.machine = Please specify the new name you want to change for the virtual instance
-instance.name = Instance Name
please.specify.the.new.group.you.want.to.assign.the.virtual.machine.to = Please specify the new group you want to assign the virtual machine to
-group.name = Group Name
after.changing.service.offering.you.must.restart.the.virtual.machine.for.new.service.offering.to.take.effect = After changing service offering, you must restart the virtual machine for the new service offering to take effect.
-service.offering = Service Offering
creating.a.template.of.disk.volume.could.take.up.to.several.hours.depending.on.the.size.of.the.disk.volume = Creating a template of disk volume could take up to several hours depending on the size of the disk volume
-name = Name
-display.text = Display Text
-os.type = OS Type
-public = Public
-password.enabled = Password Enabled
please.confirm.you.want.to.change.the.root.password.for.the.virtual.machine = Please confirm you want to change the ROOT password for the virtual machine
please.confirm.you.want.to.enable.HA.for.your.virtual.machine.once.HA.is.enabled.your.virtual.machine.will.be.automatically.restarted.in.the.event.it.is.detected.to.have.failed = Please confirm you want to enable HA for your virtual machine. Once HA is enabled, your virtual machine will be automatically restarted in the event it is detected to have failed.
please.confirm.you.want.to.disable.HA.for.the.virtual.machine.once.HA.is.disabled.the.virtual.machine.will.no.longer.be.automatically.restarted.in.the.event.of.a.failure = Please confirm you want to disable HA for the virtual machine. Once HA is disabled, the virtual machine will no longer be be automatically restarted in the event of a failure.
@@ -25,19 +65,9 @@ please.confirm.you.want.to.delete.the.ISO = Please confirm you want to delete th
the.template.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The template is used by all zones. Please confirm you want to delete it from all zones.
please.confirm.you.want.to.delete.the.template = Please confirm you want to delete the template
please.specify.limits.to.the.various.resources.-1.means.the.resource.has.no.limits = Please specify limits to the various resources. -1 means the resource has no limits.
-instance.limit = Instance Limit
-public.ip.limit = Public IP Limit
-disk.volume.limit = Disk Volume Limit
-snapshot.limit = Snapshot Limit
-template.limit = Template Limit
please.confirm.you.want.to.disable.account.that.will.prevent.account.access.to.the.cloud.and.shut.down.all.existing.virtual.machines = Please confirm you want to disable account that will prevent account access to the cloud and shut down all existing virtual machines.
please.confirm.you.want.to.lock.account.that.will.prevent.account.access.to.the.cloud = Please confirm you want to lock account that will prevent account access to the cloud.
please.confirm.you.want.to.enable.account = Please confirm you want to enable account.
-URL = URL
-zone = Zone
-bootable = Bootable
-group = Group
-disk.offering = Disk Offering
-copy.ISO.to = Copy ISO to
+
diff --git a/client/WEB-INF/classes/resources/resource_zh.properties b/client/WEB-INF/classes/resources/resource_zh.properties
index 307334f028f..44c50ef43ca 100644
--- a/client/WEB-INF/classes/resources/resource_zh.properties
+++ b/client/WEB-INF/classes/resources/resource_zh.properties
@@ -1,3 +1,29 @@
+actions = 功能
+add = 增加
+help = 幫助
+advanced = 進階
+version = 版本
+
+dashboard = 儀器板
+instance = 實例
+router = 路由器
+storage = 貯藏
+volume = 容積
+snapshot = 快照
+ip.address = 網路地址
+template = 模板
+my.template = 我的模板
+featured.template = 特色模板
+community.template = 共有模板
+iso = 空白模板
+my.iso = 我的空白模板
+featured.iso = 特色空白模板
+community.iso = 共有空白模板
+account = 帳戶
+domain = 領土
+event = 事件
+alert = 警報
+
Details = 詳述
Volume = 容積
Statistics = 統計
@@ -7,7 +33,6 @@ Service = 服務
HA = 高的可用性
Created = 產生日期
Account = 帳戶
-Domain = 領土
Host = 主機
ISO = 空白模板
diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index 8f2979097bd..8c38a2aee98 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -105,7 +105,7 @@ long milliseconds = new Date().getTime();
- Advanced
+ <%=t.t("advanced")%>
@@ -173,7 +173,7 @@ long milliseconds = new Date().getTime();
- Add
+ <%=t.t("add")%>
@@ -182,132 +182,14 @@ long milliseconds = new Date().getTime();
- Help
+ <%=t.t("help")%>
-
@@ -379,7 +226,7 @@ long milliseconds = new Date().getTime();
@@ -389,8 +236,8 @@ long milliseconds = new Date().getTime();
- Instances
+ 
+ <%=t.t("instance")%>
@@ -401,8 +248,8 @@ long milliseconds = new Date().getTime();
- Instances
+
+ <%=t.t("instance")%>
@@ -430,7 +277,7 @@ long milliseconds = new Date().getTime();
- Hosts
+ Host
@@ -439,7 +286,7 @@ long milliseconds = new Date().getTime();
@@ -449,8 +296,8 @@ long milliseconds = new Date().getTime();
- Storage
+ 
+ <%=t.t("storage")%>
@@ -458,29 +305,29 @@ long milliseconds = new Date().getTime();
@@ -490,8 +337,8 @@ long milliseconds = new Date().getTime();
- Network
+ 
+ <%=t.t("ip.address")%>
@@ -499,17 +346,10 @@ long milliseconds = new Date().getTime();
-
-
+
@@ -527,33 +367,33 @@ long milliseconds = new Date().getTime();
@@ -563,7 +403,7 @@ long milliseconds = new Date().getTime();
@@ -600,8 +440,8 @@ long milliseconds = new Date().getTime();
- Accounts
+ 
+ <%=t.t("account")%>
@@ -609,8 +449,8 @@ long milliseconds = new Date().getTime();
@@ -621,7 +461,7 @@ long milliseconds = new Date().getTime();
- Domain
+ <%=t.t("domain")%>
@@ -630,7 +470,7 @@ long milliseconds = new Date().getTime();
@@ -640,8 +480,8 @@ long milliseconds = new Date().getTime();
- Events
+ 
+ <%=t.t("event")%>
@@ -649,15 +489,15 @@ long milliseconds = new Date().getTime();
@@ -708,7 +548,7 @@ long milliseconds = new Date().getTime();
+ <%=t.t("actions")%>
