diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 899e3c0fe60..7ee026d186c 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -63,6 +63,37 @@ message.delete.VPN.connection=Please confirm that you want to delete VPN connect
 label.add.new.tier=Add new tier
 label.add.VM.to.tier=Add VM to tier
 label.remove.tier=Remove tier
+
+label.local.storage.enabled=Local Storage Enabled
+label.associated.network=Associated Network
+label.add.port.forwarding.rule=Add port forwarding rule
+label.dns=DNS
+
+label.vpc=VPC
+label.vpc.id=VPC ID
+label.tier=Tier
+label.add.vpc=Add VPC
+label.super.cidr.for.guest.networks=Super CIDR for Guest Networks
+label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
+label.configure.vpc=Configure VPC
+label.edit.vpc=Edit VPC
+label.restart.vpc=restart VPC
+message.restart.vpc=Please confirm that you want to restart the VPC
+label.remove.vpc=remove VPC
+message.remove.vpc=Please confirm that you want to remove the VPC
+label.vpn.customer.gateway=VPN Customer Gateway
+label.add.vpn.customer.gateway=Add VPN Customer Gateway
+label.IKE.encryption=IKE Encryption
+label.IKE.hash=IKE Hash
+label.IKE.DH=IKE DH
+label.ESP.encryption=ESP Encryption
+label.ESP.hash=ESP Hash
+label.perfect.forward.secrecy=Perfect Forward Secrecy
+label.IKE.lifetime=IKE lifetime (second)
+label.ESP.lifetime=ESP Lifetime (second)
+label.dead.peer.detection=Dead Peer Detection
+label.delete.VPN.customer.gateway=delete VPN Customer Gateway
+message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway
 #new labels (end) ************************************************************************************************
 
 
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index c7de4ec4866..d217e266696 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -16,12 +16,92 @@
 # under the License.
 
 #new labels (begin) **********************************************************************************************
+message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
+label.local.storage.enabled=Local storage enabled
+label.tier.details=Tier details
+label.edit.tags=Edit tags
+label.network.rate.megabytes=Network Rate (MB/s)
+label.action.enable.physical.network=Enable physical network
+label.action.disable.physical.network=Disable physical network
+message.action.enable.physical.network=Please confirm that you want to enable this physical network.
+message.action.disable.physical.network=Please confirm that you want to disable this physical network.
 
+label.select.tier=Select Tier
+label.add.ACL=Add ACL
+label.remove.ACL=Remove ACL
+label.tier=Tier
+label.network.ACL=Network ACL
+label.network.ACL.total=Network ACL Total
+label.add.new.gateway=Add new gateway
+message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC.
+label.delete.gateway=delete gateway
+message.delete.gateway=Please confirm you want to delete the gateway
+label.CIDR.of.destination.network=CIDR of destination network
+label.add.route=Add route
+label.add.static.route=Add static route
+label.remove.static.route=Remove static route
+label.site.to.site.VPN=site-to-site VPN
+label.add.VPN.gateway=Add VPN Gateway
+message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
+label.VPN.gateway=VPN Gateway
+label.delete.VPN.gateway=delete VPN Gateway
+message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gateway
+label.VPN.connection=VPN Connection
+label.IPsec.preshared.key=IPsec Preshared-Key
+label.IKE.policy=IKE policy
+label.ESP.policy=ESP policy
+label.create.VPN.connection=Create VPN Connection
+label.VPN.customer.gateway=VPN Customer Gateway
+label.CIDR.list=CIDR list
+label.IKE.lifetime=IKE Lifetime (second)
+label.ESP.lifetime=ESP Lifetime(second)
+label.dead.peer.detection=Dead Peer Detection
+label.reset.VPN.connection=Reset VPN connection
+message.reset.VPN.connection=Please confirm that you want to reset VPN connection
+label.delete.VPN.connection=delete VPN connection
+message.delete.VPN.connection=Please confirm that you want to delete VPN connection
+label.add.new.tier=Add new tier
+label.add.VM.to.tier=Add VM to tier
+label.remove.tier=Remove tier
 
+label.local.storage.enabled=Local Storage Enabled
+label.associated.network=Associated Network
+label.add.port.forwarding.rule=Add port forwarding rule
+label.dns=DNS
+
+label.vpc=VPC
+label.vpc.id=VPC ID
+label.tier=Tier
+label.add.vpc=Add VPC
+label.super.cidr.for.guest.networks=Super CIDR for Guest Networks
+label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
+label.configure.vpc=Configure VPC
+label.edit.vpc=Edit VPC
+label.restart.vpc=restart VPC
+message.restart.vpc=Please confirm that you want to restart the VPC
+label.remove.vpc=remove VPC
+message.remove.vpc=Please confirm that you want to remove the VPC
+label.vpn.customer.gateway=VPN Customer Gateway
+label.add.vpn.customer.gateway=Add VPN Customer Gateway
+label.IKE.encryption=IKE Encryption
+label.IKE.hash=IKE Hash
+label.IKE.DH=IKE DH
+label.ESP.encryption=ESP Encryption
+label.ESP.hash=ESP Hash
+label.perfect.forward.secrecy=Perfect Forward Secrecy
+label.IKE.lifetime=IKE lifetime (second)
+label.ESP.lifetime=ESP Lifetime (second)
+label.dead.peer.detection=Dead Peer Detection
+label.delete.VPN.customer.gateway=delete VPN Customer Gateway
+message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway
 #new labels (end) ************************************************************************************************
 
 
 #modified labels (begin) *****************************************************************************************
+label.network.domain.text=Network domain
+label.memory.mb=Memory (in MB)
+label.cpu.mhz=CPU (in MHz)
+message.action.remove.host=Please confirm that you want to remove this host.
 
 message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
 message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 54f079c1bb2..e7d049a26a3 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -16,12 +16,92 @@
 # under the License.
 
 #new labels (begin) **********************************************************************************************
+message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
+label.local.storage.enabled=Local storage enabled
+label.tier.details=Tier details
+label.edit.tags=Edit tags
+label.network.rate.megabytes=Network Rate (MB/s)
+label.action.enable.physical.network=Enable physical network
+label.action.disable.physical.network=Disable physical network
+message.action.enable.physical.network=Please confirm that you want to enable this physical network.
+message.action.disable.physical.network=Please confirm that you want to disable this physical network.
 
+label.select.tier=Select Tier
+label.add.ACL=Add ACL
+label.remove.ACL=Remove ACL
+label.tier=Tier
+label.network.ACL=Network ACL
+label.network.ACL.total=Network ACL Total
+label.add.new.gateway=Add new gateway
+message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC.
+label.delete.gateway=delete gateway
+message.delete.gateway=Please confirm you want to delete the gateway
+label.CIDR.of.destination.network=CIDR of destination network
+label.add.route=Add route
+label.add.static.route=Add static route
+label.remove.static.route=Remove static route
+label.site.to.site.VPN=site-to-site VPN
+label.add.VPN.gateway=Add VPN Gateway
+message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
+label.VPN.gateway=VPN Gateway
+label.delete.VPN.gateway=delete VPN Gateway
+message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gateway
+label.VPN.connection=VPN Connection
+label.IPsec.preshared.key=IPsec Preshared-Key
+label.IKE.policy=IKE policy
+label.ESP.policy=ESP policy
+label.create.VPN.connection=Create VPN Connection
+label.VPN.customer.gateway=VPN Customer Gateway
+label.CIDR.list=CIDR list
+label.IKE.lifetime=IKE Lifetime (second)
+label.ESP.lifetime=ESP Lifetime(second)
+label.dead.peer.detection=Dead Peer Detection
+label.reset.VPN.connection=Reset VPN connection
+message.reset.VPN.connection=Please confirm that you want to reset VPN connection
+label.delete.VPN.connection=delete VPN connection
+message.delete.VPN.connection=Please confirm that you want to delete VPN connection
+label.add.new.tier=Add new tier
+label.add.VM.to.tier=Add VM to tier
+label.remove.tier=Remove tier
 
+label.local.storage.enabled=Local Storage Enabled
+label.associated.network=Associated Network
+label.add.port.forwarding.rule=Add port forwarding rule
+label.dns=DNS
+
+label.vpc=VPC
+label.vpc.id=VPC ID
+label.tier=Tier
+label.add.vpc=Add VPC
+label.super.cidr.for.guest.networks=Super CIDR for Guest Networks
+label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
+label.configure.vpc=Configure VPC
+label.edit.vpc=Edit VPC
+label.restart.vpc=restart VPC
+message.restart.vpc=Please confirm that you want to restart the VPC
+label.remove.vpc=remove VPC
+message.remove.vpc=Please confirm that you want to remove the VPC
+label.vpn.customer.gateway=VPN Customer Gateway
+label.add.vpn.customer.gateway=Add VPN Customer Gateway
+label.IKE.encryption=IKE Encryption
+label.IKE.hash=IKE Hash
+label.IKE.DH=IKE DH
+label.ESP.encryption=ESP Encryption
+label.ESP.hash=ESP Hash
+label.perfect.forward.secrecy=Perfect Forward Secrecy
+label.IKE.lifetime=IKE lifetime (second)
+label.ESP.lifetime=ESP Lifetime (second)
+label.dead.peer.detection=Dead Peer Detection
+label.delete.VPN.customer.gateway=delete VPN Customer Gateway
+message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway
 #new labels (end) ************************************************************************************************
 
 
 #modified labels (begin) *****************************************************************************************
+label.network.domain.text=Network domain
+label.memory.mb=Memory (in MB)
+label.cpu.mhz=CPU (in MHz)
+message.action.remove.host=Please confirm that you want to remove this host.
 
 message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
 message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index fffd4617ac6..e4c7ca3e11c 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -1350,6 +1350,35 @@ dictionary = {
 'message.delete.VPN.connection': '<fmt:message key="message.delete.VPN.connection" />',
 'label.add.new.tier': '<fmt:message key="label.add.new.tier" />',
 'label.add.VM.to.tier': '<fmt:message key="label.add.VM.to.tier" />',
-'label.remove.tier': '<fmt:message key="label.remove.tier" />'
+'label.remove.tier': '<fmt:message key="label.remove.tier" />',
+'label.local.storage.enabled=Local Storage Enabled': '<fmt:message key="label.local.storage.enabled=Local Storage Enabled" />',
+'label.associated.network': '<fmt:message key="label.associated.network" />',
+'label.add.port.forwarding.rule': '<fmt:message key="label.add.port.forwarding.rule" />',
+'label.dns': '<fmt:message key="label.dns" />',
+'label.vpc': '<fmt:message key="label.vpc" />',
+'label.vpc.id': '<fmt:message key="label.vpc.id" />',
+'label.tier': '<fmt:message key="label.tier" />',
+'label.add.vpc': '<fmt:message key="label.add.vpc" />',
+'label.super.cidr.for.guest.networks': '<fmt:message key="label.super.cidr.for.guest.networks" />',
+'label.DNS.domain.for.guest.networks': '<fmt:message key="label.DNS.domain.for.guest.networks" />',
+'label.configure.vpc': '<fmt:message key="label.configure.vpc" />',
+'label.edit.vpc': '<fmt:message key="label.edit.vpc" />',
+'label.restart.vpc': '<fmt:message key="label.restart.vpc" />',
+'message.restart.vpc': '<fmt:message key="message.restart.vpc" />',
+'label.remove.vpc': '<fmt:message key="label.remove.vpc" />',
+'message.remove.vpc': '<fmt:message key="message.remove.vpc" />',
+'label.vpn.customer.gateway': '<fmt:message key="label.vpn.customer.gateway" />',
+'label.add.vpn.customer.gateway': '<fmt:message key="label.add.vpn.customer.gateway" />',
+'label.IKE.encryption': '<fmt:message key="label.IKE.encryption" />',
+'label.IKE.hash': '<fmt:message key="label.IKE.hash" />',
+'label.IKE.DH': '<fmt:message key="label.IKE.DH" />',
+'label.ESP.encryption': '<fmt:message key="label.ESP.encryption" />',
+'label.ESP.hash': '<fmt:message key="label.ESP.hash" />',
+'label.perfect.forward.secrecy': '<fmt:message key="label.perfect.forward.secrecy" />',
+'label.IKE.lifetime': '<fmt:message key="label.IKE.lifetime" />',
+'label.ESP.lifetime': '<fmt:message key="label.ESP.lifetime" />',
+'label.dead.peer.detection': '<fmt:message key="label.dead.peer.detection" />',
+'label.delete.VPN.customer.gateway': '<fmt:message key="label.delete.VPN.customer.gateway" />',
+'message.delete.VPN.customer.gateway': '<fmt:message key="message.delete.VPN.customer.gateway" />'
 };
 </script>