diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index e238576281e..73bf2e809eb 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -43,6 +43,7 @@ label.role=Role
label.account.name=Account Name
label.vms=VMs
label.ips=IPs
+label.ip=IP
label.bytes.received=Bytes Received
label.bytes.sent=Bytes Sent
label.state=State
@@ -94,7 +95,9 @@ label.system.capacity=System Wide Capacity
label.public.ips=Public IP Addresses
label.allocated=Allocated
label.private.ips=Private IP Addresses
+label.guest.ip=Guest IP Address
label.memory.allocated=Memory Allocated
+label.memory.used=Memory Used
label.cpu.allocated=CPU Allocated
label.primary.allocated=Primary Storage Allocated
label.used=Used
@@ -141,7 +144,52 @@ label.warn=Warn
label.error=Error
label.value=Value
label.edit=Edit
-
+label.hosts=Hosts
+label.host=Host
+label.virtual.appliances=Virtual Appliances
+label.system.vms=System VMs
+label.statistics=Statistics
+label.ip.address=IP Address
+label.version=Version
+label.os.preference=OS Preference
+label.last.disconnected=Last Disconnected
+label.cpu=CPU
+label.memory.total=Memory Total
+label.network.read=Network Read
+label.network.write=Network Write
+label.ip.or.fqdn=IP or FQDN
+label.disk.total=Disk Total
+label.disk.allocated=Disk Allocated
+label.created=Created
+label.system.vm.type=System VM Type
+label.public.ip=Public IP Address
+label.by.state=By State
+label.port.forwarding=Port Forwarding
+label.load.balancer=Load Balancer
+label.vpn=VPN
+label.vlan=VLAN
+label.source.nat=Source NAT
+label.network.type=Network Type
+label.network.id=Network ID
+label.associated.network.id=Associated Network ID
+label.static.nat=Static NAT
+label.static.nat.to=Static NAT to
+label.public.port=Public Port
+label.private.port=Private Port
+label.protocol=Protocol
+label.algorithm=Algorithm
+label.enabling.vpn=Enabling VPN
+label.acquire.new.ip=Acquire New IP
+label.manage=Manage
+label.delete=Delete
+label.assign=Assign
+label.assign.to.load.balancer=Assigning instance to load balancer
+label.remove.from.load.balancer=Removing instance from load balancer
+label.revoke=Revoke
+label.removing.user=Removing User
+label.enabling.vpn.access=Enabling VPN Access
+label.disabling.vpn.access=Disabling VPN Access
+label.adding.user=Adding User
label.lang.english=English
label.lang.chinese=Chinese
@@ -204,6 +252,15 @@ message.add.host=Please specify the following parameters to add a new host
message.add.primary=Please specify the following parameters to add a new primary storage
message.add.disk.offering=Please specify the following parameters to add a new disk offering
message.restart.mgmt.server=Please restart your management server(s) for your new settings to take effect.
+message.update.os.preference=Please choose a OS preference for this host. All virtual instances with similar preferences will be first allocated to this host before choosing another.
+message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP
+message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
+message.enable.vpn=VPN access is currently not enabled. Please click here to enable VPN.
+message.remove.vpn.access=Please confirm you want to remove VPN access from the following user
+message.enable.vpn.access=VPN is currently disabled for this IP Address. Would you like to enable VPN access?
+message.disable.vpn.access=Please confirm you want to disable VPN Access.
+message.acquire.public.ip=Please select a zone from which you want to acquire your new IP from.
+message.allow.vpn.access=Please enter a username and password of the user that you want to allow VPN access.
#Errors
error.login=Your username/password does not match our records.
diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp
index a590dc590c1..d45af7efe3e 100644
--- a/ui/jsp/host.jsp
+++ b/ui/jsp/host.jsp
@@ -1,805 +1,938 @@
-<%@ page import="java.util.*" %>
-
-<%@ page import="com.cloud.utils.*" %>
-
-<%
- Locale browserLocale = request.getLocale();
- CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
-%>
-
-
