diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 755a0810d08..efed75a0089 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -274,6 +274,16 @@ label.by.traffic.type=By Traffic Type
 label.private.ip.range=Private IP Range
 label.cloud.managed=Cloud.com Managed
 label.vsphere.managed=vSphere Managed
+label.update.ssl=Update SSL Certificate
+label.basic.mode=Basic Mode
+label.advanced.mode=Advanced Mode
+label.internal.dns.1=Internal DNS 1
+label.internal.dns.2=Internal DNS 2
+label.vlan.range=VLAN Range
+label.reserved.system.ip=Reserved System IP
+label.certificate=Certificate
+label.updating=Updating
+label.resource=Resource
 
 label.lang.english=English
 label.lang.chinese=Chinese
@@ -333,6 +343,10 @@ label.go.step.2=Go to Step 2
 label.go.step.3=Go to Step 3
 label.go.step.4=Go to Step 4
 label.go.step.5=Go to Step 5
+label.zone.step.1.title=Step 1: <strong>Select a Network</strong>
+label.zone.step.2.title=Step 2: <strong>Add a Zone</strong>
+label.zone.step.3.title=Step 3: <strong>Add a Pod</strong>
+label.zone.step.4.title=Step 4: <strong>Add an IP range</strong>
 
 label.vm.add=Add VM
 label.vm.start=Start VM
@@ -383,8 +397,20 @@ message.add.ip.range.direct.network=Add an IP range to direct network <b><span i
 message.add.network=Add a new network for zone: <b><span id="zone_name"></span></b>
 message.add.host=Add a host for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
 message.add.cluster=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
+message.add.cluster.zone=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>
 message.add.primary.storage=Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
 message.add.ip.range.to.pod=<p>Add an IP range to pod: <b><span id="pod_name_label"></span></b></p>
+message.number.zones=<h2><span> # of </span> Zones</h2>
+message.number.pods=<h2><span> # of </span> Pods</h2>
+message.number.clusters=<h2><span> # of </span> Clusters</h2>
+message.number.hosts=<h2><span> # of </span> Host</h2>
+message.number.storage=<h2><span> # of </span> Primary Storage</h2>
+message.zone.step.1.desc=Please select a network model for your zone.
+message.zone.step.2.desc=Please enter the following info to add a new zone 
+message.zone.step.3.desc=Please enter the following info to add a new pod 
+message.basic.mode.desc=Choose this network model if you do <b>*<u>not</u>*</b> want to enable any VLAN support.  All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation.
+message.advanced.mode.desc=Choose this network model if you wish to enable VLAN support.  This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking.
+message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance:
 
 #Errors
 error.login=Your username/password does not match our records.
diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index b4f0ab3987d..b859b6c7558 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -1,17 +1,15 @@
-<%@ page import="java.util.*" %>
-
-<%@ page import="com.cloud.utils.*" %>
-
-<%
-    Locale browserLocale = request.getLocale();
-    CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
-%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:if test="${!empty cookie.lang}">
+	<fmt:setLocale value="${cookie.lang.value}" />
+</c:if>
+<fmt:setBundle basename="resources/messages"/>
 
 <div class="main_title" id="right_panel_header">
     <div class="main_titleicon">
         <img src="images/title_resourceicon.gif" /></div>
     <h1>
-        Resource
+        <fmt:message key="label.resource"/>
     </h1>
 </div>
 <div class="contentbox" id="right_panel_content">
@@ -25,7 +23,7 @@
             <div class="dbrow even" style="border:1px solid #CCC;">
                 <div class="dbrow_cell" style="width: 64%; border: none;">
                     <div class="resource_titlebox">
-                        <h2><span> # of </span> Zones</h2>
+						<fmt:message key="message.number.zones"/>
 					</div>
                 </div>
                 <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
@@ -40,7 +38,7 @@
             <div class="dbrow odd" style="margin-top:10px; border:1px solid #CCC;">
                 <div class="dbrow_cell" style="width: 64%; border: none; ">
                     <div class="resource_titlebox">
-                        <h2><span> # of </span> Pods</h2>
+						<fmt:message key="message.number.pods"/>
 					</div>
                 </div>
                 <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
@@ -56,7 +54,7 @@
             <div class="dbrow even" style="margin-top:10px; border:1px solid #CCC;">
                 <div class="dbrow_cell" style="width: 64%; border: none; ">
                     <div class="resource_titlebox">
-                        <h2><span> # of </span> Clusters</h2>
+						<fmt:message key="message.number.clusters"/>                       
 					</div>
                 </div>
                 <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
@@ -72,8 +70,7 @@
             <div class="dbrow odd" style="margin-top:10px; border:1px solid #CCC;">
                 <div class="dbrow_cell" style="width: 64%; border: none;">
                      <div class="resource_titlebox">
-                        <h2><span> # of </span> Host</h2>
-                         
+						<fmt:message key="message.number.hosts"/>   
                     </div>
                 </div>
                 <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
@@ -89,8 +86,7 @@
             <div class="dbrow even" style="margin-top:10px; border:1px solid #CCC;">
                 <div class="dbrow_cell" style="width: 64%; border: none;">
                      <div class="resource_titlebox">
-                        <h2><span> # of </span> Primary Storage</h2>
-                      
+						<fmt:message key="message.number.storage"/>
                     </div>
                 </div>
                  <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
@@ -113,7 +109,7 @@
             <div class="actionpanel_button_icons">
                 <img src="images/addvm_actionicon.png" alt="Add Zone" /></div>
             <div class="actionpanel_button_links">
-                Add Zone
+                <fmt:message key="label.add.zone"/>
             </div>
         </div>
     </div>    
@@ -122,7 +118,7 @@
             <div class="actionpanel_button_icons">
                 <img src="images/addvm_actionicon.png" alt="Update SSL Certificate" /></div>
             <div class="actionpanel_button_links">
-                Update SSL Certificate
+                <fmt:message key="label.update.ssl"/>
             </div>
         </div>
     </div>    
@@ -137,13 +133,13 @@
     <div id="step1" style="display: block;">
         <div class="zonepopup_container_top">
             <div class="vmpopup_steps" style="color: #FFF; background: url(images/step1_bg.png) no-repeat top left">
-                Step 1</div>
+                <fmt:message key="label.step.1"/></div>
             <div class="vmpopup_steps" style="background: url(images/step2_bg.gif) no-repeat top left">
-                Step 2</div>
+                <fmt:message key="label.step.2"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 3</div>
+                <fmt:message key="label.step.3"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 4</div>
+                <fmt:message key="label.step.4"/></div>
             <div class="vmpopup_steps" style="background: url(images/laststep_bg.gif) no-repeat top left">
             </div>
             <div class="zonepopup_container_closebutton" id="close_button">
@@ -153,9 +149,10 @@
             <div class="zonepopup_maincontentarea">
                 <div class="zonepopup_titlebox">
                     <h2>
-                        Step 1: <strong>Select a Network</strong></h2>
+						<fmt:message key="label.zone.step.1.title"/>
+					</h2>
                     <p>
-                        Please select a network model for your zone.
+						<fmt:message key="message.zone.step.1.desc"/>
                     </p>
                 </div>
                 <div class="zonepopup_contentpanel">
@@ -164,13 +161,13 @@
                         <div class="zonepopup_selectionbox">
                             <input type="radio" name="basic_advanced" value="Basic" id="Basic" class="radio" />
                             <label class="label">
-                                Basic Mode</label>
+                                <fmt:message key="label.basic.mode"/></label>
                             <div class="zonepopup_selectiondescriptionbox">
                                 <div class="zonepopup_selectiondescriptionbox_top">
                                 </div>
                                 <div class="zonepopup_selectiondescriptionbox_bot">
                                     <p>
-                                        Choose this network model if you do <b>*<u>not</u>*</b> want to enable any VLAN support.  All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation.
+										<fmt:message key="message.basic.mode.desc"/>
                                     </p>
                                 </div>
                             </div>
@@ -178,13 +175,13 @@
                         <div class="zonepopup_selectionbox">
                             <input type="radio" name="basic_advanced" value="Advanced" id="Advanced" class="radio" />
                             <label class="label">
-                               Advanced Mode</label>
+                               <fmt:message key="label.advanced.mode"/></label>
                             <div class="zonepopup_selectiondescriptionbox">
                                 <div class="zonepopup_selectiondescriptionbox_top">
                                 </div>
                                 <div class="zonepopup_selectiondescriptionbox_bot">
-                                    <p>
-                                        Choose this network model if you wish to enable VLAN support.  This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking.
+                                    <p>	
+										<fmt:message key="message.advanced.mode.desc"/>
                                     </p>
                                 </div>
                             </div>
@@ -193,7 +190,7 @@
                 </div>
                 <div class="zonepopup_navigationpanel">                    
                     <div class="vmpop_nextbutton" id="go_to_step_2">
-                        Go to Step 2</div>
+                        <fmt:message key="label.go.step.2"/></div>
                 </div>
             </div>
         </div>
@@ -206,13 +203,13 @@
     <div id="step2" style="display: none;">
         <div class="zonepopup_container_top">
            <div class="vmpopup_steps" style="background: url(images/step1_bg_unselected.png) no-repeat top left">
-                Step 1</div>
+                <fmt:message key="label.step.1"/></div>
             <div class="vmpopup_steps" style="color: #FFF; background: url(images/step2_selected.gif) no-repeat top left">
-                Step 2</div>
+                <fmt:message key="label.step.2"/></div>
             <div class="vmpopup_steps" style="background: url(images/step2_bg.gif) no-repeat top left">
-                Step 3</div>
+                <fmt:message key="label.step.3"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 4</div>
+                <fmt:message key="label.step.4"/></div>
             <div class="vmpopup_steps" style="background: url(images/laststep_bg.gif) no-repeat top left">
             </div>
             <div class="zonepopup_container_closebutton" id="close_button">
@@ -222,9 +219,10 @@
             <div class="zonepopup_maincontentarea">
                 <div class="zonepopup_titlebox">
                     <h2>
-                        Step 2: <strong>Add a Zone</strong></h2>
+						<fmt:message key="label.zone.step.2.title"/>
+					</h2>
                     <p>
-                        Please enter the following info to add a new zone 
+						<fmt:message key="message.zone.step.2.desc"/>
                     </p>
                 </div>
                 <div class="zonepopup_contentpanel">
@@ -232,32 +230,32 @@
                         <form action="#" method="post" id="form_acquire">
                             <ol>
                                 <li>
-                                    <label>Name:</label>
+                                    <label><fmt:message key="label.name"/>:</label>
                                     <input class="text" type="text" name="add_zone_name" id="add_zone_name"/>
                                     <div id="add_zone_name_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>
                                 <li>
-                                    <label>DNS 1:</label>
+                                    <label><fmt:message key="label.dns.1"/>:</label>
                                     <input class="text" type="text" name="add_zone_dns1" id="add_zone_dns1"/>
                                     <div id="add_zone_dns1_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>
                                 <li>
-                                    <label>DNS 2:</label>
+                                    <label><fmt:message key="label.dns.2"/>:</label>
                                     <input class="text" type="text" name="add_zone_dns2" id="add_zone_dns2"/>
                                     <div id="add_zone_dns2_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>
                                 <li>
-                                    <label>Internal DNS 1:</label>
+                                    <label><fmt:message key="label.internal.dns.1"/>:</label>
                                     <input class="text" type="text" id="add_zone_internaldns1"/>
                                     <div id="add_zone_internaldns1_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>
                                 <li>
-                                    <label>Internal DNS 2:</label>
+                                    <label><fmt:message key="label.internal.dns.2"/>:</label>
                                     <input class="text" type="text" id="add_zone_internaldns2"/>
                                     <div id="add_zone_internaldns2_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>
                                 <li id="add_zone_vlan_container">
-                                    <label>VLAN Range:</label>
+                                    <label><fmt:message key="label.vlan.range"/>:</label>
                                     <input class="text" style="width:92px" type="text" name="add_zone_startvlan" id="add_zone_startvlan"/><span>-</span>
                                    <input class="text" style="width:92px" type="text" name="add_zone_endvlan" id="add_zone_endvlan"/>
                                     <div id="add_zone_startvlan_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
@@ -269,16 +267,16 @@
                                     <div id="add_zone_guestcidraddress_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>				
                                 <li>
-                                    <label>Public?:</label>
+                                    <label><fmt:message key="label.public"/>?:</label>
                                     <select class="select" id="add_zone_public">
-                                        <option value="true">Yes</option>		
-                                        <option value="false">No</option>										
+                                        <option value="true"><fmt:message key="label.yes"/></option>		
+                                        <option value="false"><fmt:message key="label.no"/></option>										
                                     </select>
                                 </li>	
                                 
                                 
                                 <li id="domain_dropdown_container" style="display:none">
-                                    <label>Domain:</label>
+                                    <label><fmt:message key="label.domain"/>:</label>
                                     <select class="select" id="domain_dropdown">					
                                     </select>
                                 </li>
@@ -290,10 +288,10 @@
                 </div>
                 <div class="zonepopup_navigationpanel">
                     <div class="vmpop_prevbutton" id="back_to_step_1" style="display: block;">
-                    Back
+                    <fmt:message key="label.back"/>
                     </div>
                     <div class="vmpop_nextbutton" id="go_to_step_3">
-                        Go to Step 3</div>
+                        <fmt:message key="label.go.step.3"/></div>
                 </div>
             </div>
         </div>
@@ -306,13 +304,13 @@
     <div id="step3" style="display: none;">
         <div class="zonepopup_container_top">
            <div class="vmpopup_steps" style="background: url(images/step1_bg_unselected.png) no-repeat top left">
-                Step 1</div>
+                <fmt:message key="label.step.1"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 2</div>
+                <fmt:message key="label.step.2"/></div>
             <div class="vmpopup_steps" style="color: #FFF; background: url(images/step2_selected.gif) no-repeat top left">
-                Step 3</div>
+                <fmt:message key="label.step.3"/></div>
             <div class="vmpopup_steps" style="background: url(images/step2_bg.gif) no-repeat top left">
-                Step 4</div>   
+                <fmt:message key="label.step.4"/></div>   
              <div class="vmpopup_steps" style="background: url(images/laststep_bg.gif) no-repeat top left">
             </div>
             <div class="zonepopup_container_closebutton" id="close_button">
@@ -321,10 +319,11 @@
         <div class="zonepopup_container_mid">
             <div class="zonepopup_maincontentarea">
                 <div class="zonepopup_titlebox">
-                    <h2>
-                        Step 3: <strong>Add a Pod</strong></h2>
+					<h2>
+						<fmt:message key="label.zone.step.3.title"/>
+					</h2>
                     <p>
-                        Please enter the following info to add a new pod 
+						<fmt:message key="message.zone.step.3.desc"/>
                     </p>
                 </div>
                 <div class="zonepopup_contentpanel">
@@ -333,28 +332,28 @@
                         <ol>
                             <li>
                                 <label for="user_name" style="width: 115px;">
-                                    Name:</label>
+                                    <fmt:message key="label.name"/>:</label>
                                 <input class="text" type="text" name="add_pod_name" id="add_pod_name" />
                                 <div id="add_pod_name_errormsg" class="dialog_formcontent_errormsg" style="display: none; margin-left:0;">
                                 </div>
                             </li>
                             <li>
                                 <label for="add_pod_gateway" style="width: 115px;">
-                                    Gateway:</label>
+                                    <fmt:message key="label.gateway"/>:</label>
                                 <input class="text" type="text" id="add_pod_gateway" />
                                 <div id="add_pod_gateway_errormsg" class="dialog_formcontent_errormsg" style="display: none; margin-left:0;">
                                 </div>
                             </li>
                             <li>
                                 <label for="user_name" style="width: 115px;">
-                                    Netmask:</label>
+                                    <fmt:message key="label.netmask"/>:</label>
                                 <input class="text" type="text" name="add_pod_netmask" id="add_pod_netmask" />
                                 <div id="add_pod_netmask_errormsg" class="dialog_formcontent_errormsg" style="display: none; margin-left:0;">
                                 </div>
                             </li>
                             <li>
                                 <label for="user_name" style="width: 115px;">
-                                    Reserved System IP:</label>
+                                    <fmt:message key="label.reserved.system.ip"/>:</label>
                                 <input class="text" style="width: 92px" type="text" name="add_pod_startip" id="add_pod_startip" /><span>-</span>
                                 <input class="text" style="width: 92px" type="text" name="add_pod_endip" id="add_pod_endip" />
                                 <div id="add_pod_startip_errormsg" class="dialog_formcontent_errormsg" style="display: none; margin-left:133px;">
@@ -368,10 +367,10 @@
                 </div>
                 <div class="zonepopup_navigationpanel">
                     <div class="vmpop_prevbutton" id="back_to_step_2" style="display: block;">
-                        Back
+                        <fmt:message key="label.back"/>
                     </div>
                     <div class="vmpop_nextbutton" id="go_to_step_4" style="display: block;">
-                        Go to Step 4</div>                    
+                        <fmt:message key="label.go.step.4"/></div>                    
                 </div>
             </div>
         </div>
@@ -384,13 +383,13 @@
     <div id="step4" style="display: none;">
         <div class="zonepopup_container_top">
            <div class="vmpopup_steps" style="background: url(images/step1_bg_unselected.png) no-repeat top left">
-                Step 1</div>
+                <fmt:message key="label.step.1"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 2</div>
+                <fmt:message key="label.step.2"/></div>
              <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 3</div>
+                <fmt:message key="label.step.3"/></div>
             <div class="vmpopup_steps" style="color: #FFF; background: url(images/step2_selected.gif) no-repeat top left">
-                Step 4</div>   
+                <fmt:message key="label.step.4"/></div>   
              <div class="vmpopup_steps" style="background: url(images/laststep_slectedbg.gif) no-repeat top left">
             </div>
             <div class="zonepopup_container_closebutton" id="close_button">
@@ -400,7 +399,8 @@
             <div class="zonepopup_maincontentarea">
                 <div class="zonepopup_titlebox">
                     <h2>
-                        Step 4: <strong>Add an IP range</strong></h2>
+						<fmt:message key="label.zone.step.3.title"/>
+                    </h2>
                     <p>                        
                     </p>
                 </div>
@@ -410,7 +410,7 @@
                         <ol id="guestip_list">                            
                             <li id="guestip_container">
                                 <label style="width: 115px;">
-                                    Guest IP Range:</label>
+                                   <fmt:message key="label.guest.ip.range"/>:</label>
                                 <input class="text" style="width: 92px" type="text" id="startguestip" /><span>-</span>
                                 <input class="text" style="width: 92px" type="text" id="endguestip" />
                                 <div id="startguestip_errormsg" class="dialog_formcontent_errormsg" style="display: none; margin-left:133px;">
@@ -420,14 +420,14 @@
                             </li>  
 							<li id="guestnetmask_container">
                                 <label style="width: 115px;">
-                                    Guest Netmask:</label>
+                                    <fmt:message key="label.guest.netmask"/>:</label>
                                 <input class="text" type="text" id="guestnetmask" />
                                 <div id="guestnetmask_errormsg" class="dialog_formcontent_errormsg" style="display: none; margin-left:0;">
                                 </div>
                             </li>	                            
                             <li id="guestgateway_container">
                                 <label style="width: 115px;">
-                                    Guest Gateway:</label>
+                                    <fmt:message key="label.guest.gateway"/>:</label>
                                 <input class="text" type="text" id="guestgateway" />
                                 <div id="guestgateway_errormsg" class="dialog_formcontent_errormsg" style="display: none; margin-left:0;">
                                 </div>
@@ -436,7 +436,7 @@
                         <ol id="publicip_list" style="display:none">
                             <li id="add_publicip_vlan_container">
                                 <label for="add_publicip_vlan_tagged">
-                                    VLAN:</label>
+                                    <fmt:message key="label.vlan"/>:</label>
                                 <select class="select" name="add_publicip_vlan_tagged" id="add_publicip_vlan_tagged">
                                     <option value="untagged">untagged</option>
                                     <option value="tagged">tagged</option>
@@ -444,14 +444,14 @@
                             </li>
                             <li style="display: none" id="add_publicip_vlan_vlan_container">
                                 <label for="user_name">
-                                    VLAN ID:</label>
+                                    <fmt:message key="label.vlan.id"/>:</label>
                                 <input class="text" type="text" name="add_publicip_vlan_vlan" id="add_publicip_vlan_vlan" />
                                 <div id="add_publicip_vlan_vlan_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                                 </div>
                             </li>
                             <li id="add_publicip_vlan_scope_container">
                                 <label for="add_publicip_vlan_scope">
-                                    Scope:</label>
+                                    <fmt:message key="label.scope"/>:</label>
                                 <select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
                                     <!--  
                                     <option value="zone-wide">zone-wide</option>
@@ -461,19 +461,19 @@
                             </li>
                             <li style="display: none" id="add_publicip_vlan_pod_container">
                                 <label for="user_name">
-                                    Pod:</label>
+                                    <fmt:message key="label.pod"/>:</label>
                                 <select class="select" name="add_publicip_vlan_pod" id="add_publicip_vlan_pod">
                                 </select>
                             </li>
                             <li style="display: none" id="add_publicip_vlan_domain_container">
                                 <label for="user_name">
-                                    Domain:</label>
+                                    <fmt:message key="label.domain"/>:</label>
                                 <select class="select" name="add_publicip_vlan_domain" id="add_publicip_vlan_domain">
                                 </select>
                             </li>
                             <li style="display: none" id="add_publicip_vlan_account_container">
                                 <label for="user_name">
-                                    Account:</label>
+                                    <fmt:message key="label.account"/>:</label>
                                 <input class="text" type="text" name="add_publicip_vlan_account" id="add_publicip_vlan_account" />
                                 <div id="add_publicip_vlan_account_errormsg" class="dialog_formcontent_errormsg"
                                     style="display: none;">
@@ -481,7 +481,7 @@
                             </li>
                             <li>
                                 <label for="user_name">
-                                    Gateway:</label>
+                                    <fmt:message key="label.gateway"/>:</label>
                                 <input class="text" type="text" name="add_publicip_vlan_gateway" id="add_publicip_vlan_gateway" />
                                 <div id="add_publicip_vlan_gateway_errormsg" class="dialog_formcontent_errormsg"
                                     style="display: none;">
@@ -489,7 +489,7 @@
                             </li>
                             <li>
                                 <label for="user_name">
-                                    Netmask:</label>
+                                    <fmt:message key="label.netmask"/>:</label>
                                 <input class="text" type="text" name="add_publicip_vlan_netmask" id="add_publicip_vlan_netmask" />
                                 <div id="add_publicip_vlan_netmask_errormsg" class="dialog_formcontent_errormsg"
                                     style="display: none;">
@@ -497,7 +497,7 @@
                             </li>
                             <li>
                                 <label for="user_name">
-                                    IP Range:</label>
+                                    <fmt:message key="label.ip.range"/>:</label>
                                 <input class="text" style="width: 67px" type="text" name="add_publicip_vlan_startip"
                                     id="add_publicip_vlan_startip" /><span>-</span>
                                 <input class="text" style="width: 67px" type="text" name="add_publicip_vlan_endip"
@@ -514,10 +514,10 @@
                 </div>
                 <div class="zonepopup_navigationpanel">
                     <div class="vmpop_prevbutton" id="back_to_step_3" style="display: block;">
-                        Back
+                        <fmt:message key="label.back"/>
                     </div>                     
                     <div class="vmpop_nextbutton" id="submit" style="display: block;">
-                        Submit
+                        <fmt:message key="label.submit"/>
                     </div>                   
                 </div>
             </div>
@@ -531,13 +531,13 @@
     <div id="after_submit_screen" style="display: none;">
         <div class="zonepopup_container_top">
            <div class="vmpopup_steps" style="background: url(images/step1_bg_unselected.png) no-repeat top left">
-                Step 1</div>
+                <fmt:message key="label.step.1"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 2</div>
+                <fmt:message key="label.step.2"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 3</div>
+                <fmt:message key="label.step.3"/></div>
             <div class="vmpopup_steps" style="background: url(images/othersteps_bg.gif) no-repeat top left">
-                Step 4</div>
+                <fmt:message key="label.step.4"/></div>
             <div class="vmpopup_steps" style="background: url(images/laststep_bg.gif) no-repeat top left">
             </div>
             <div class="zonepopup_container_closebutton" id="close_button">
@@ -549,7 +549,7 @@
                 <div class="zonepopup_contentpanel">
                 	<div id="spinning_wheel" class="zonepoup_loadingbox" style="display:none;">
                     	<div class="zonepoup_loader"></div>
-                        <p> Adding....</p>
+                        <p> <fmt:message key="label.adding"/>....</p>
                     </div>
                     
                    <!-- <div id="after_action_message" class="zonepoup_msgbox"></div>-->
@@ -559,7 +559,7 @@
                            <div id="add_zone_tick_cross"> <!-- class "zonepopup_reviewtick" or class "zonepopup_reviewcross" -->
                            </div>
                            <div class="zonepopup_review_label">
-                              Zone:</div>
+                              <fmt:message key="label.zone"/>:</div>
                            <span id="add_zone_message"> <!-- add class "error" if in error -->
                            </span>
                       </div>
@@ -570,7 +570,7 @@
                            <div id="add_pod_tick_cross"> <!-- class "zonepopup_reviewtick" or class "zonepopup_reviewcross" -->
                            </div>
                            <div class="zonepopup_review_label">
-                              Pod:</div>
+                              <fmt:message key="label.pod"/>:</div>
                            <span id="add_pod_message"> <!-- add class "error" if in error -->
                            </span>
                       </div>
@@ -581,7 +581,7 @@
                            <div id="add_iprange_tick_cross"> <!-- class "zonepopup_reviewtick" or class "zonepopup_reviewcross" -->
                            </div>
                            <div class="zonepopup_review_label">
-                              IP Range:</div>
+                              <fmt:message key="label.ip.range"/>:</div>
                            <span id="add_iprange_message"> <!-- add class "error" if in error -->
                            </span>
                       </div>
@@ -589,7 +589,7 @@
                 </div>
                 <div class="zonepopup_navigationpanel">                    
                     <div class="vmpop_nextbutton" id="close_button">
-                        Close</div>
+                        <fmt:message key="label.close"/></div>
                 </div>
             </div>
         </div>
@@ -603,13 +603,13 @@
 
 <!-- Update Certificate Dialog -->
 <div id="dialog_update_cert" title="Update Console Proxy SSL Certificate" style="display:none">
-	<p>Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance:</p>
+	<p><fmt:message key="message.update.ssl"/></p>
 
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form_acquire">
 			<ol>
 				<li>
-					<label>Certificate:</label>
+					<label><fmt:message key="label.certificate"/>:</label>
 					<textarea class="text" name="update_cert" id="update_cert" style="height: 300px; width: 400px" />
 					<div id="update_cert_errormsg" class="dialog_formcontent_errormsg" style="display:none; width:300px" ></div>
 				</li>
@@ -619,7 +619,7 @@
    <!--Loading box-->
    <div id="spinning_wheel" class="ui_dialog_loaderbox" style="display:none;">
    	<div class="ui_dialog_loader"></div>
-       <p>Updating....</p>
+       <p><fmt:message key="label.updating"/>....</p>
    </div>
    
    <!--Confirmation msg box-->
@@ -639,7 +639,7 @@
            
             <li>
                 <label style="width: 115px;">
-                    Zone:</label>
+                    <fmt:message key="label.zone"/>:</label>
                 <select class="select" id="zone_dropdown">
                 </select>
                 <div id="zone_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -648,28 +648,28 @@
            
             <li>
                 <label for="user_name" style="width: 115px;">
-                    Name:</label>
+                    <fmt:message key="label.name"/>:</label>
                 <input class="text" type="text" name="add_pod_name" id="add_pod_name" />
                 <div id="add_pod_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_pod_gateway" style="width: 115px;">
-                    Gateway:</label>
+                    <fmt:message key="label.gateway"/>:</label>
                 <input class="text" type="text" id="add_pod_gateway" />
                 <div id="add_pod_gateway_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="user_name" style="width: 115px;">
-                    Netmask:</label>
+                    <fmt:message key="label.netmask"/>:</label>
                 <input class="text" type="text" name="add_pod_netmask" id="add_pod_netmask" />
                 <div id="add_pod_netmask_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="user_name" style="width: 115px;">
-                    Private IP Range:</label>
+                    <fmt:message key="label.private.ip.range"/>:</label>
                 <input class="text" style="width: 67px" type="text" name="add_pod_startip" id="add_pod_startip" /><span>-</span>
                 <input class="text" style="width: 67px" type="text" name="add_pod_endip" id="add_pod_endip" />
                 <div id="add_pod_startip_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -679,7 +679,7 @@
             </li>            
             <li id="guestip_container" style="display: none">
                 <label style="width: 115px;">
-                    Guest IP Range:</label>
+                    <fmt:message key="label.guest.ip.range"/>:</label>
                 <input class="text" style="width: 92px" type="text" id="startguestip" /><span>-</span>
                 <input class="text" style="width: 92px" type="text" id="endguestip" />
                 <div id="startguestip_errormsg" class="dialog_formcontent_errormsg" style="display: none;
@@ -690,7 +690,7 @@
             </li>
             <li id="guestnetmask_container" style="display: none">
                 <label style="width: 115px;">
-                    Guest Netmask:</label>
+                    <fmt:message key="label.guest.netmask"/>:</label>
                 <input class="text" type="text" id="guestnetmask" />
                 <div id="guestnetmask_errormsg" class="dialog_formcontent_errormsg" style="display: none;
                     margin-left: 0;">
@@ -698,7 +698,7 @@
             </li>
             <li id="guestgateway_container" style="display: none">
                 <label style="width: 115px;">
-                    Guest Gateway:</label>
+                    <fmt:message key="label.guest.gateway"/>:</label>
                 <input class="text" type="text" id="guestgateway" />
                 <div id="guestgateway_errormsg" class="dialog_formcontent_errormsg" style="display: none;
                     margin-left: 0;">
@@ -712,7 +712,7 @@
         <div class="ui_dialog_loader">
         </div>
         <p>
-            Adding....</p>
+            <fmt:message key="label.adding"/>....</p>
     </div>
     <!--Confirmation msg box-->
     <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->
@@ -728,13 +728,13 @@
 <!-- Add Cluster Dialog in resource page (begin) -->
 <div id="dialog_add_external_cluster_in_resource_page" title="Add Cluster" style="display: none">
     <p>
-        Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>
+		<fmt:message key="message.add.cluster.zone"/>
     </p>
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>
             <li>
-            	<label for="cluster_hypervisor">Hypervisor:</label>
+            	<label for="cluster_hypervisor"><fmt:message key="label.hypervisor"/>:</label>
                 <select class="select" id="cluster_hypervisor">
                     <option value="XenServer" SELECTED>Xen Server</option>		
                     <option value="KVM">KVM</option>										
@@ -743,10 +743,10 @@
             </li>
             <li input_group="vmware">
                 <label>
-                    Cluster Type:</label>
+                    <fmt:message key="label.cluster.type"/>:</label>
                 <select class="select" id="type_dropdown">
-                    <option value="CloudManaged">Cloud.com Managed</option>		
-                    <option value="ExternalManaged" SELECTED>vSphere Managed</option>										
+                    <option value="CloudManaged"><fmt:message key="label.cloud.managed"/></option>		
+                    <option value="ExternalManaged" SELECTED><fmt:message key="label.vsphere.managed"/></option>										
                 </select>
                 <div id="pod_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
@@ -754,7 +754,7 @@
             
             <li>
                 <label>
-                    Zone:</label>
+                    <fmt:message key="label.zone"/>:</label>
                 <select class="select" id="zone_dropdown">
                 </select>
                 <div id="zone_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -763,7 +763,7 @@
             
             <li>
                 <label>
-                    Pod:</label>
+                    <fmt:message key="label.pod"/>:</label>
                 <select class="select" id="pod_dropdown">
                 </select>
                 <div id="pod_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -771,35 +771,35 @@
             </li>   
             <li input_group="vmware" input_sub_group="external">
                 <label for="cluster_hostname">
-                    vCenter Server:</label>
+                    <fmt:message key="label.vcenter.host"/>:</label>
                 <input class="text" type="text" name="cluster_hostname" id="cluster_hostname" />
                 <div id="cluster_hostname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" input_sub_group="external">
                 <label for="cluster_username">
-                    vCenter User:</label>
+                    <fmt:message key="label.vcenter.username"/>:</label>
                 <input class="text" type="text" name="cluster_username" id="cluster_username" />
                 <div id="cluster_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" input_sub_group="external">
                 <label for="cluster_password">
-                    Password:</label>
+                    <fmt:message key="label.vcenter.password"/>:</label>
                 <input class="text" type="password" name="cluster_password" id="cluster_password" autocomplete="off" />
                 <div id="cluster_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" input_sub_group="external">
                 <label for="cluster_datacenter">
-                    vCenter Datacenter:</label>
+                    <fmt:message key="label.vcenter.datacenter"/>:</label>
                 <input class="text" type="text" name="cluster_datacenter" id="cluster_datacenter" />
                 <div id="cluster_datacenter_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="cluster_name" id="cluster_name_label">
-                    vCenter Cluster:</label>
+                    <fmt:message key="label.vcenter.cluster"/>:</label>
                 <input class="text" type="text" name="cluster_name" id="cluster_name" />
                 <div id="cluster_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
@@ -812,7 +812,7 @@
         <div class="ui_dialog_loader">
         </div>
         <p>
-            Adding....</p>
+            <fmt:message key="label.adding"/>....</p>
     </div>
     <!--Confirmation msg box-->
     <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->
@@ -830,20 +830,9 @@
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>            
-            <!--  
-            <li>
-            	<label for="host_hypervisor">Hypervisor:</label>
-                <select class="select" id="host_hypervisor">
-                    <option value="XenServer" SELECTED>Xen Server</option>		
-                    <option value="KVM">KVM</option>										
-                    <option value="VmWare">VMware</option>										
-                    <option value="">Auto</option>									
-                </select>
-            </li>
-            -->
             <li>
                 <label>
-                    Zone:</label>
+                    <fmt:message key="label.adding"/>:</label>
                 <select class="select" id="zone_dropdown">
                 </select>
                 <div id="zone_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -851,7 +840,7 @@
             </li>   
             <li>
                 <label>
-                    Pod:</label>
+                    <fmt:message key="label.pod"/>:</label>
                 <select class="select" id="pod_dropdown">
                 </select>
                 <div id="pod_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -859,7 +848,7 @@
             </li>               
             <li>
                 <label>
-                    Cluster:</label>
+                    <fmt:message key="label.cluster"/>:</label>
                 <select class="select" id="cluster_select">
                 </select>
                 <div id="cluster_select_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -867,56 +856,56 @@
             </li>                    
             <li input_group="general">
                 <label for="host_hostname">
-                    Host name:</label>
+                    <fmt:message key="label.host.name"/>:</label>
                 <input class="text" type="text" name="host_hostname" id="host_hostname" />
                 <div id="host_hostname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="general">
                 <label for="user_name">
-                    User name:</label>
+                    <fmt:message key="label.username"/>:</label>
                 <input class="text" type="text" name="host_username" id="host_username" />
                 <div id="host_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="general">
                 <label for="host_password">
-                    Password:</label>
+                    <fmt:message key="label.password"/>:</label>
                 <input class="text" type="password" name="host_password" id="host_password" autocomplete="off" />
                 <div id="host_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" style="display: none;">
                 <label for="host_vcenter_address">
-                    vCenter Address:</label>
+                    <fmt:message key="label.vcenter.host"/>:</label>
                 <input class="text" type="text" name="host_vcenter_address" id="host_vcenter_address" />
                 <div id="host_vcenter_address_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" style="display: none;">
                 <label for="host_vcenter_username">
-                    vCenter User:</label>
+                    <fmt:message key="label.vcenter.username"/>:</label>
                 <input class="text" type="text" name="host_vcenter_username" id="host_vcenter_username" />
                 <div id="host_vcenter_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" style="display: none;">
                 <label for="host_vcenter_password">
-                    vCenter Password:</label>
+                    <fmt:message key="label.vcenter.password"/>:</label>
                 <input class="text" type="password" name="host_vcenter_password" id="host_vcenter_password" autocomplete="off" />
                 <div id="host_vcenter_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" style="display: none;">
                 <label for="host_vcenter_dc">
-                    vCenter Datacenter:</label>
+                    <fmt:message key="label.vcenter.datacenter"/>:</label>
                 <input class="text" type="text" name="host_vcenter_dc" id="host_vcenter_dc" />
                 <div id="host_vcenter_dc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmware" style="display: none;">
                 <label for="host_vcenter_host">
-                    vCenter Host:</label>
+                    <fmt:message key="label.esx.host"/>:</label>
                 <input class="text" type="text" name="host_vcenter_host" id="host_vcenter_host" />
                 <div id="host_vcenter_host_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
@@ -929,7 +918,7 @@
         <div class="ui_dialog_loader">
         </div>
         <p>
-            Adding....</p>
+            <fmt:message key="label"/>....</p>
     </div>
     <!--Confirmation msg box-->
     <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->
@@ -949,7 +938,7 @@
         <ol>
             <li>
                 <label>
-                    Zone:</label>
+                    <fmt:message key="label.zone"/>:</label>
                 <select class="select" id="zone_dropdown">
                 </select>
                 <div id="zone_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -957,7 +946,7 @@
             </li>   
             <li>
                 <label>
-                    Pod:</label>
+                    <fmt:message key="label.pod"/>:</label>
                 <select class="select" id="pod_dropdown">
                 </select>
                 <div id="pod_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -965,7 +954,7 @@
             </li>   
             <li id="pool_cluster_container">
                 <label for="pool_cluster">
-                    Cluster:</label>
+                    <fmt:message key="label.cluster"/>:</label>
                 <select class="select" id="cluster_select">
                 </select>
                 <div id="cluster_select_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -973,14 +962,14 @@
             </li>
             <li>
                 <label for="user_name">
-                    Name:</label>
+                    <fmt:message key="label.name"/>:</label>
                 <input class="text" type="text" name="add_pool_name" id="add_pool_name" />
                 <div id="add_pool_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_pool_protocol">
-                    Protocol:</label>
+                    <fmt:message key="label.protocol"/>:</label>
                 <select class="select" id="add_pool_protocol">
                     <option value="nfs">NFS</option>
                     <option value="iscsi">ISCSI</option>
@@ -989,49 +978,49 @@
             </li>
             <li id="add_pool_server_container">
                 <label for="add_pool_nfs_server">
-                    Server:</label>
+                    <fmt:message key="label.server"/>:</label>
                 <input class="text" type="text" name="add_pool_nfs_server" id="add_pool_nfs_server" />
                 <div id="add_pool_nfs_server_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li id="add_pool_path_container" input_group="nfs">
                 <label for="add_pool_path">
-                    Path:</label>
+                    <fmt:message key="label.path"/>:</label>
                 <input class="text" type="text" name="add_pool_path" id="add_pool_path" />
                 <div id="add_pool_path_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li id="add_pool_iqn_container" style="display: none" input_group="iscsi">
                 <label for="add_pool_iqn">
-                    Target IQN:</label>
+                    <fmt:message key="label.target.iqn"/>:</label>
                 <input class="text" type="text" name="add_pool_iqn" id="add_pool_iqn" />
                 <div id="add_pool_iqn_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li id="add_pool_lun_container" style="display: none" input_group="iscsi">
                 <label for="add_pool_lun">
-                    LUN #:</label>
+                    <fmt:message key="label.lun"/> #:</label>
                 <input class="text" type="text" name="add_pool_lun" id="add_pool_lun" />
                 <div id="add_pool_lun_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmfs">
                 <label for="add_pool_vmfs_dc">
-                    vCenter Datacenter:</label>
+                    <fmt:message key="label.vcenter.datacenter"/>:</label>
                 <input class="text" type="text" name="add_pool_vmfs_dc" id="add_pool_vmfs_dc" />
                 <div id="add_pool_vmfs_dc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li input_group="vmfs">
                 <label for="add_pool_vmfs_ds">
-                    vCenter Datastore:</label>
+                    <fmt:message key="label.vcenter.datastore"/>:</label>
                 <input class="text" type="text" name="add_pool_vmfs_ds" id="add_pool_vmfs_ds" />
                 <div id="add_pool_vmfs_ds_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li id="add_pool_tags_container">
                 <label for="add_pool_tags">
-                    Tags:</label>
+                    <fmt:message key="label.tags"/>:</label>
                 <input class="text" type="text" id="add_pool_tags" />
                 <div id="add_pool_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
@@ -1044,7 +1033,7 @@
         <div class="ui_dialog_loader">
         </div>
         <p>
-            Adding....</p>
+            <fmt:message key="label.adding"/>....</p>
     </div>
     <!--Confirmation msg box-->
     <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->