From 16d03106f9680f7c26f46ac14a996de669391fbc Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Fri, 21 Jan 2011 15:44:53 -0800
Subject: [PATCH] bug 4556: localize string replacements for index.jsp,
 account.jsp, alert.jsp, and cluster.jsp

---
 .../classes/resources/messages.properties     |  71 ++++++++
 ui/index.jsp                                  |  38 +---
 ui/jsp/account.jsp                            | 171 +++++++++---------
 ui/jsp/alert.jsp                              |  37 ++--
 ui/jsp/cluster.jsp                            | 105 +++++------
 5 files changed, 225 insertions(+), 197 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index aa3523cc0fa..776e0e508c7 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -36,6 +36,65 @@ label.cluster=Cluster
 label.domain.name=Domain Name
 label.advanced=Advanced
 label.details=Details
+label.users=Users
+label.detaching.disk=Detaching Disk
+label.id=ID
+label.role=Role
+label.account.name=Account Name
+label.vms=VMs
+label.ips=IPs
+label.bytes.received=Bytes Received
+label.bytes.sent=Bytes Sent
+label.state=State
+label.save=Save
+label.cancel=Cancel
+label.add.account=Add Account
+label.add.user=Add User
+label.waiting=Waiting
+label.api.key=API Key
+label.secret.key=Secret Key
+label.email=Email
+label.first.name=First Name
+label.last.name=Last Name
+label.timezone=Timezone
+label.instance.limits=Instance Limits
+label.ip.limits=Public IP Limits
+label.volume.limits=Volume Limits
+label.snapshot.limits=Snapshot Limits
+label.template.limits=Template Limits
+label.adding=Adding
+label.sent=Sent
+label.user=User
+label.domain.admin=Domain Admin
+label.admin=Admin
+label.by.role=by role
+label.type=Type
+label.type.id=Type ID
+label.description=Description
+label.hypervisor.type=Hypervisor Type
+label.cluster.type=Cluster Type
+label.host.name=Host Name
+label.vcenter.datastore=vCenter Datastore
+label.vcenter.address=vCenter Address
+label.vcenter.username=vCenter Username
+label.vcenter.password=vCenter Password
+label.vcenter.datacenter=vCenter Datacenter
+label.vcenter.host=vCenter Host
+label.protocol=Protocol
+label.nfs=NFS
+label.iscsi=iSCSI
+label.vmfs=VMFS
+label.server=Server
+label.path=Path
+label.target.iqn=Target IQN
+label.lun=LUN
+label.tags=Tags
+
+label.lang.english=English
+label.lang.chinese=Chinese
+
+label.theme.default=Default Theme
+label.theme.grey=Custom - Grey
 
 label.menu.dashboard=Dashboard
 label.menu.instances=Instances
@@ -58,6 +117,8 @@ label.menu.my.isos=My ISOs
 label.menu.featured.isos=Featured ISOs
 label.menu.community.isos=Community ISOs
 label.menu.accounts=Accounts
+label.menu.my.accounts=My Accounts
+label.menu.all.accounts=All Accounts
 label.menu.domains=Domains
 label.menu.events=Events
 label.menu.alerts=Alerts
@@ -69,15 +130,25 @@ label.menu.system.vms=System VMs
 label.menu.configuration=Configuration
 label.menu.service.offerings=Service Offerings
 label.menu.disk.offerings=Disk Offerings
+label.menu.network.offerings=Network Offerings
 label.menu.global.settings=Global Settings
 label.menu.security.groups=Security Groups
 
+
 label.vm.start=Start VM
 label.vm.stop=Stop VM
 label.vm.reboot=Reboot VM
 label.vm.destroy=Destroy VM
 
 #Messages
+message.edit.limits=Please specify limits to the following resources.  A "-1" indicates no limit to the amount of resources create.
+message.disable.account=Please confirm you want to disable this account.  By disabling the account, all users for this account will no longer have access to their cloud resources.  All running virtual machines will be immediately shut down. 
+message.lock.account=Please confirm you want to lock this account.  By locking the account, all users for this account will no longer be able to manage their cloud resources.  Existing resources can still be accessed.
+message.enable.account=Please confirm you want to enable this account.user
+message.new.user=Specify the following to add a new user to the account 
+message.edit.confirm=Please confirm your changes before clicking 'Save'
+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
 
 #Errors
 error.login=Your username/password does not match our records.
diff --git a/ui/index.jsp b/ui/index.jsp
index c93e7e2e570..2bc8973b7b7 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -114,23 +114,23 @@
                             <div class="loginoptions_panel">
                             	<div class="loginoptions_box">
                                 	<div id="lang_button" class="loginoptions_dropdownbutton">
-                                    	<p id="lang_name">English</p>
+                                    	<p id="lang_name"><fmt:message key="label.lang.english"/></p>
                                         <div class="loginoptions_ddarrow"></div>
          							
 										<div id="lang_menu" class="loginoptions_dropdown" style="display:none;">
 											<ul>
-												<li id="en">English</li>
-												<li id="zh">Chinese</li>
+												<li id="en"><fmt:message key="label.lang.english"/></li>
+												<li id="zh"><fmt:message key="label.lang.chinese"/></li>
 											</ul>
 										</div>
                                     </div>
                                     <div id="theme_button" class="loginoptions_dropdownbutton">
-                                    	<p id="theme_name">Default Theme</p>
+                                    	<p id="theme_name"><fmt:message key="label.theme.default"/></p>
                                         <div class="loginoptions_ddarrow"></div>
 										<div id="theme_menu" class="loginoptions_dropdown" style="display:none;">
 											<ul>
-												<li id="theme_default">Default Theme</li>
-												<li id="custom/custom1/css/custom1.css">Custom - Grey</li>
+												<li id="theme_default"><fmt:message key="label.theme.default"/></li>
+												<li id="custom/custom1/css/custom1.css"><fmt:message key="label.theme.grey"/></li>
 											</ul>
 										</div>
                                     </div>
@@ -161,20 +161,6 @@
                     <p>
                         <fmt:message key="label.welcome"/> <span id="main_username"></span>, <a href="#" id="main_logout"><fmt:message key="label.logout"/></a>
                     </p>
-					<!--
-                    <div class="language_dropdownpanel">
-                    	<div class="language_icon"></div>
-                        <p>English</p>
-                        <div class="language_ddarrow"></div>
-                        <div class="language_dropdownbox" style="display:none;">
-                        	<ul>
-                            	<li>English</li>
-                                <li>汉语 </li>
-                                <li>Fran&ccedil;ais</li>
-                            </ul>
-                        </div>
-                    </div>
-                    -->
                 </div>
             </div>
         </div>
@@ -535,7 +521,7 @@
 				                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
 				                    </div>
 				                    <span id="label">
-				                        My Accounts
+				                        <fmt:message key="label.menu.my.accounts"/>
 				                    </span>
 				                </div>
 				            </div>
@@ -546,7 +532,7 @@
 				                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
 				                    </div>
 				                    <span id="label">
-				                        All Accounts
+				                        <fmt:message key="label.menu.my.accounts"/>
 				                    </span>
 				                </div>
 				            </div>
@@ -708,7 +694,7 @@
                                 <div class="leftmenu_secondindent">
                                     <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                     </div>
-                                    Network Offering
+                                    <fmt:message key="label.menu.network.offerings"/>
                                 </div>
                             </div>
                         </div>
@@ -732,12 +718,6 @@
     <!-- Left Menu ends here-->
     </div>
     <div id="footer">
-	<!--
-     <div class="footer_testprovisiongtool" id="launch_test" style="display:none">
-     	<div class="footer_testprovisiongtool_icon"></div>
-        <a href="#">Launch Test Provisioning Tool</a>
-     </div>
-	-->
         <div class="poweredby_box">
         </div>
     </div>
diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 9d134ae0156..e3aa0358da5 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -1,20 +1,15 @@
-<%@ page import="java.util.*" %>
+<%@ 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"/>
 
-<%@ page import="com.cloud.utils.*" %>
-
-<%
-    Locale browserLocale = request.getLocale();
-    CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
-%>
 <!-- account detail panel (begin) -->
-<!-- Loading -->
-    
- 
 <div class="main_title" id="right_panel_header">
     <div class="main_titleicon">
         <img src="images/title_accountsicon.gif" /></div>
-    <h1>
-        Accounts</h1>
+    <h1><fmt:message key="label.menu.accounts"/></h1>
 </div>
 <div class="contentbox" id="right_panel_content">	
     <div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
@@ -23,25 +18,25 @@
     </div>
     <div class="tabbox" style="margin-top: 15px;">
         <div id="tab_details" class="content_tabs on">
-            <%=t.t("Details")%></div>
+            <fmt:message key="label.details"/></div>
         <div id="tab_user" class="content_tabs off">
-            <%=t.t("Users")%></div>
+            <fmt:message key="label.users"/></div>
     </div> 
     <!--Details tab (begin)-->
     <div id="tab_content_details">
         <div class="rightpanel_mainloader_panel" style="display:none;">
               <div class="rightpanel_mainloaderbox">
                    <div class="rightpanel_mainloader_animatedicon"></div>
-                   <p>Loading &hellip;</p>    
+                   <p><fmt:message key="label.loading"/> &hellip;</p>    
               </div>               
         </div>
         <div class="grid_container">
         	<div class="grid_header">
             	<div id="grid_header_title" class="grid_header_title">(title)</div>
-                <div id="action_link" class="grid_actionbox"><p>Actions</p>
+                <div id="action_link" class="grid_actionbox"><p><fmt:message key="label.actions"/></p>
                     <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                         <ul class="actionsdropdown_boxlist" id="action_list">
-                        	<li><%=t.t("no.available.actions")%></li>
+                        	<li><fmt:message key="label.no.actions"/></li>
                         </ul>
                     </div>
                 </div>
@@ -50,13 +45,13 @@
                     <div class="gridheader_loader" id="icon">
                     </div>
                     <p id="description">
-                        Detaching Disk &hellip;</p>
+                        <fmt:message key="label.detaching.disk"/> &hellip;</p>
                 </div>
             </div>
             <div class="grid_rows odd">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("ID")%>:</div>
+                        <fmt:message key="label.id"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="id">
@@ -66,7 +61,7 @@
             <div class="grid_rows even">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("Role")%>:</div>
+                        <fmt:message key="label.role"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="role">
@@ -76,7 +71,7 @@
             <div class="grid_rows odd">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        Account Name:</div>
+                        <fmt:message key="label.account.name"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="name">
@@ -88,7 +83,7 @@
             <div class="grid_rows even">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("Domain")%>:</div>
+                        <fmt:message key="label.domain"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="domain">
@@ -98,7 +93,7 @@
             <div class="grid_rows odd">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("VMs")%>:</div>
+                        <fmt:message key="label.vms"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="vm_total">
@@ -108,7 +103,7 @@
             <div class="grid_rows even">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("IPs")%>:</div>
+                        <fmt:message key="label.ips"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="ip_total">
@@ -118,7 +113,7 @@
             <div class="grid_rows odd">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("Bytes.Received")%>:</div>
+                        <fmt:message key="label.bytes.received"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="bytes_received">
@@ -128,7 +123,7 @@
             <div class="grid_rows even">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("Bytes.Sent")%>:</div>
+                        <fmt:message key="label.bytes.sent"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="bytes_sent">
@@ -138,7 +133,7 @@
             <div class="grid_rows odd">
                 <div class="grid_row_cell" style="width: 20%;">
                     <div class="row_celltitles">
-                        <%=t.t("State")%>:</div>
+                        <fmt:message key="label.state"/>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="state">
@@ -147,8 +142,8 @@
             </div>
         </div>        
         <div class="grid_botactionpanel">
-	        <div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
-	        <div class="gridbot_buttons" id="cancel_button" style="display:none;">Cancel</div>
+	        <div class="gridbot_buttons" id="save_button" style="display:none;"><fmt:message key="label.save"/></div>
+	        <div class="gridbot_buttons" id="cancel_button" style="display:none;"><fmt:message key="label.cancel"/></div>
 	    </div>         
     </div>
     <!--Details tab (end)-->
@@ -157,7 +152,7 @@
     	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
               <div class="rightpanel_mainloaderbox">
                    <div class="rightpanel_mainloader_animatedicon"></div>
-                   <p>Loading &hellip;</p>    
+                   <p><fmt:message key="label.loading"/> &hellip;</p>    
               </div>               
         </div>
         <div id="tab_container">
@@ -172,18 +167,18 @@
     <div class="actionpanel_button_wrapper" id="add_account_button" style="display: none">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/addvm_actionicon.png" alt="Add Account" /></div>
+                <img src="images/addvm_actionicon.png" /></div>
             <div class="actionpanel_button_links">
-                Add Account
+                <fmt:message key="label.add.account"/>s
             </div>
         </div>
     </div>
     <div class="actionpanel_button_wrapper" id="add_user_button" style="display: none">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/addvm_actionicon.png" alt="Add User" /></div>
+                <img src="images/addvm_actionicon.png" /></div>
             <div class="actionpanel_button_links">
-                Add User
+                <fmt:message key="label.add.user"/>
             </div>
         </div>
     </div>
@@ -205,7 +200,7 @@
             <div class="gridheader_loader" id="icon">
             </div>
             <p id="description">
-                Waiting &hellip;
+                <fmt:message key="label.waiting"/> &hellip;
             </p>
         </div>       
     </div>
@@ -213,14 +208,14 @@
     <div class="grid_rows" id="after_action_info_container" style="display:none">
         <div class="grid_row_cell" style="width: 90%; border: none;">
             <div class="row_celltitles">
-                <strong id="after_action_info">Message will appear here</strong></div>
+                <strong id="after_action_info"></strong></div>
         </div>
     </div>
         
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                ID:</div>
+                <fmt:message key="label.id"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="id">
@@ -230,7 +225,7 @@
     <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                User Name:</div>
+                <fmt:message key="label.username"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="username">
@@ -240,7 +235,7 @@
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                State:</div>
+                <fmt:message key="label.state"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="state">
@@ -250,7 +245,7 @@
     <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                API Key:</div>
+                <fmt:message key="label.api.key"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="apikey">
@@ -260,7 +255,7 @@
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                Secret Key:</div>
+                <fmt:message key="label.secret.key"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="secretkey">
@@ -270,7 +265,7 @@
     <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                Account Name:</div>
+                <fmt:message key="label.account.name"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="account">
@@ -280,7 +275,7 @@
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                Role:</div>
+                <fmt:message key="label.role"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="role">
@@ -290,7 +285,7 @@
     <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                Domain:</div>
+                <fmt:message key="label.domain"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="domain">
@@ -300,7 +295,7 @@
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                Email:</div>
+                <fmt:message key="label.email"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="email">
@@ -310,7 +305,7 @@
     <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                First Name:</div>
+                <fmt:message key="label.first.name"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="firstname">
@@ -320,7 +315,7 @@
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                Last Name:</div>
+                <fmt:message key="label.last.name"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="lastname">
@@ -330,7 +325,7 @@
     <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                Timezone:</div>
+                <fmt:message key="label.timezone"/>:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="timezone">
@@ -343,33 +338,33 @@
 <!-- dialogs (begin) -->
 <div id="dialog_resource_limits" title="Resource Limits" style="display:none">
 	<p>
-	    <%=t.t("please.specify.limits.to.the.various.resources.-1.means.the.resource.has.no.limits")%>	    
+		<fmt:message key="message.edit.limits"/>
 	</p>
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form_acquire">
 			<ol>
 				<li>
-					<label><%=t.t("instance.limit")%>:</label>
+					<label><fmt:message key="label.instance.limits"/>:</label>
 					<input class="text" type="text" name="limits_vm" id="limits_vm" value="-1" />
 					<div id="limits_vm_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div> 
 				</li>
 				<li>
-					<label><%=t.t("public.ip.limit")%>:</label>
+					<label><fmt:message key="label.ip.limits"/>:</label>
 					<input class="text" type="text" name="limits_ip" id="limits_ip" value="-1" />
 					<div id="limits_ip_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div> 
 				</li>
 				<li>
-					<label><%=t.t("disk.volume.limit")%>:</label>
+					<label><fmt:message key="label.volume.limits"/>:</label>
 					<input class="text" type="text" name="limits_volume" id="limits_volume" value="-1" />
 					<div id="limits_volume_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div> 
 				</li>
 				<li>
-					<label><%=t.t("snapshot.limit")%>:</label>
+					<label><fmt:message key="label.snapshot.limits"/>:</label>
 					<input class="text" type="text" name="limits_snapshot" id="limits_snapshot" value="-1" />
 					<div id="limits_snapshot_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div> 
 				</li>
 				<li>
-					<label><%=t.t("template.limit")%>:</label>
+					<label><fmt:message key="label.template.limits"/>:</label>
 					<input class="text" type="text" name="limits_template" id="limits_template" value="-1" />
 					<div id="limits_template_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div> 
 				</li>
@@ -380,19 +375,19 @@
 
 <div id="dialog_disable_account" title="Disable account" style="display:none">
     <p>
-        <%=t.t("please.confirm.you.want.to.disable.account.that.will.prevent.account.access.to.the.cloud.and.shut.down.all.existing.virtual.machines")%>        
+		<fmt:message key="message.disable.account"/>
     </p>
 </div>
 
 <div id="dialog_lock_account" title="Lock account" style="display:none">
     <p>
-        <%=t.t("please.confirm.you.want.to.lock.account.that.will.prevent.account.access.to.the.cloud")%>        
+		<fmt:message key="message.lock.account"/>
     </p>
 </div>
 
 <div id="dialog_enable_account" title="Enable account" style="display:none">
     <p>
-        <%=t.t("please.confirm.you.want.to.enable.account")%>        
+		<fmt:message key="message.enable.account"/>
     </p>
 </div>
 
@@ -403,14 +398,14 @@
         <ol>
             <li>
                 <label for="add_user_username">
-                    User name:</label>
+                    <fmt:message key="label.username"/>:</label>
                 <input class="text" type="text" id="add_user_username" />
                 <div id="add_user_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_password">
-                    Password:</label>
+                    <fmt:message key="label.password"/>:</label>
                 <input class="text" type="password" id="add_user_password"
                     autocomplete="off" />
                 <div id="add_user_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -418,49 +413,49 @@
             </li>
             <li>
                 <label for="add_user_email">
-                    Email:</label>
+                    <fmt:message key="label.email"/>:</label>
                 <input class="text" type="text" id="add_user_email" />
                 <div id="add_user_email_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_firstname">
-                    First name:</label>
+                    <fmt:message key="label.first.name"/>:</label>
                 <input class="text" type="text" id="add_user_firstname" />
                 <div id="add_user_firstname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_lastname">
-                    Last name:</label>
+                    <fmt:message key="label.last.name"/>:</label>
                 <input class="text" type="text" id="add_user_lastname" />
                 <div id="add_user_lastname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_account">
-                    Account:</label>
+                    <fmt:message key="label.account"/>:</label>
                 <input class="text" type="text" id="add_user_account" />
                 <div id="add_user_account_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_account_type">
-                    Role:</label>
+                    <fmt:message key="label.role"/>:</label>
                 <select class="select" id="add_user_account_type">
-                    <option value="0">User</option>
-                    <option value="1">Admin</option>
+                    <option value="0"><fmt:message key="label.user"/></option>
+                    <option value="1"><fmt:message key="label.admin"/></option>
                 </select>
             </li>
             <li>
                 <label for="add_user_domain">
-                    Domain:</label>
+                    <fmt:message key="label.domain"/>:</label>
                 <select class="select" id="domain_dropdown">
                 </select>
             </li>
             <li>
                 <label for="add_user_timezone">
-                    Time Zone:</label>
+                    <fmt:message key="label.timezone"/>:</label>
                 <select class="select" id="add_user_timezone" style="width: 240px">
                     <option value=""></option>
                     <option value='Etc/GMT+12'>[UTC-12:00] GMT-12:00</option>
@@ -533,21 +528,21 @@
 <!-- Add User Dialog (begin)-->
 <div id="dialog_add_user" title="Add New User" style="display: none">  
     <p>
-        Add a new user under account <b><span id="account_name"></span></b>
+        <fmt:message key="message.new.user"/> :<b><span id="account_name"></span></b>
     </p> 
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>
             <li>
                 <label for="add_user_username">
-                    User name:</label>
+                    <fmt:message key="label.username"/>:</label>
                 <input class="text" type="text" id="add_user_username" />
                 <div id="add_user_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_password">
-                    Password:</label>
+                    <fmt:message key="label.password"/>:</label>
                 <input class="text" type="password" id="add_user_password"
                     autocomplete="off" />
                 <div id="add_user_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -555,28 +550,28 @@
             </li>
             <li>
                 <label for="add_user_email">
-                    Email:</label>
+                    <fmt:message key="label.email"/>:</label>
                 <input class="text" type="text" id="add_user_email" />
                 <div id="add_user_email_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_firstname">
-                    First name:</label>
+                    <fmt:message key="label.first.name"/>:</label>
                 <input class="text" type="text" id="add_user_firstname" />
                 <div id="add_user_firstname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="add_user_lastname">
-                    Last name:</label>
+                    <fmt:message key="label.last.name"/>:</label>
                 <input class="text" type="text" id="add_user_lastname" />
                 <div id="add_user_lastname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>            
             <li>
                 <label for="add_user_timezone">
-                    Time Zone:</label>
+                    <fmt:message key="label.timezone"/>:</label>
                 <select class="select" id="add_user_timezone" style="width: 240px">
                     <option value=""></option>
                     <option value='Etc/GMT+12'>[UTC-12:00] GMT-12:00</option>
@@ -648,7 +643,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.  -->
@@ -663,32 +658,32 @@
 
 <!-- Edit User Dialog (begin)-->
 <div id="dialog_edit_user" title="Edit User" style="display:none">
-	<p>Please review your changes before clicking 'Save'</p>
+	<p><fmt:message key="message.edit.confirm"/></p>
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form2">
 			<ol>		
 				<li>
-					<label for="edit_user_username">User name:</label>
+					<label for="edit_user_username"><fmt:message key="label.username"/>:</label>
 					<input class="text" type="text" name="edit_user_username" id="edit_user_username"/>
 					<div id="edit_user_username_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="edit_user_email">Email:</label>
+					<label for="edit_user_email"><fmt:message key="label.email"/>:</label>
 					<input class="text" type="text" name="edit_user_email" id="edit_user_email"/>
 					<div id="edit_user_email_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="edit_user_firstname">First name:</label>
+					<label for="edit_user_firstname"><fmt:message key="label.first.name"/>:</label>
 					<input class="text" type="text" name="edit_user_firstname" id="edit_user_firstname"/>
 					<div id="edit_user_firstname_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="edit_user_lastname">Last name:</label>
+					<label for="edit_user_lastname"><fmt:message key="label.last.name"/>:</label>
 					<input class="text" type="text" name="edit_user_lastname" id="edit_user_lastname"/>
 					<div id="edit_user_lastname_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>	
 				<li>
-				    <label for="edit_user_timezone">Time Zone:</label>
+				    <label for="edit_user_timezone"><fmt:message key="label.timezone"/>:</label>
 				    <select class="select" id="edit_user_timezone">
                         <option value=""></option>                      
                         <option value='Etc/GMT+11'>[UTC-11:00] GMT-11:00</option>
@@ -759,12 +754,12 @@
 
 <!-- Change Password Dialog (begin) -->
 <div id="dialog_change_password" title="Change Password" style="display:none">
-	<p>Please review your changes before clicking 'Save'</p>
+	<p><fmt:message key="message.edit.confirm"/></p>
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form4">
 			<ol>					
 				<li>
-					<label for="change_password_password1">Password:</label>
+					<label for="change_password_password1"><fmt:message key="label.password"/>:</label>
 					<input class="text" type="password" name="change_password_password1" id="change_password_password1" AUTOCOMPLETE="off"/>
 					<div id="change_password_password1_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>							
@@ -784,10 +779,10 @@
             <ol>               
                 <li>
                     <select class="select" id="adv_search_role">
-                        <option value="">by role</option>
-                        <option value="0">User</option>
-                        <option value="2">Domain-Admin</option>
-                        <option value="1">Admin</option>
+                        <option value=""><fmt:message key="label.by.role"/></option>
+                        <option value="0"><fmt:message key="label.user"/></option>
+                        <option value="2"><fmt:message key="label.domain.admin"/></option>
+                        <option value="1"><fmt:message key="label.admin"/></option>
                     </select>
                 </li>
             </ol>
diff --git a/ui/jsp/alert.jsp b/ui/jsp/alert.jsp
index 246578bb924..5e134967ff2 100644
--- a/ui/jsp/alert.jsp
+++ b/ui/jsp/alert.jsp
@@ -1,11 +1,9 @@
-<%@ 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"/>
 
 <!-- alert detail panel (begin) -->
 <div class="main_title" id="right_panel_header">
@@ -13,8 +11,7 @@
     <div class="main_titleicon">
         <img src="images/title_alerticon.gif" /></div>
 
-    <h1>Alerts
-    </h1>
+    <h1><fmt:message key="label.menu.alerts"/></h1>
 </div>
 <div class="contentbox" id="right_panel_content">
     <div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
@@ -23,7 +20,7 @@
     </div>
     <div class="tabbox" style="margin-top:15px;">
         <div class="content_tabs on">
-            <%=t.t("Details")%></div>        
+            <fmt:message key="label.details"/></div>        
     </div>    
     <div id="tab_content_details">
         <div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
@@ -31,7 +28,7 @@
                 <div class="rightpanel_mainloader_animatedicon">
                 </div>
                 <p>
-                    Loading &hellip;</p>
+                    <fmt:message key="label.loading"/> &hellip;</p>
             </div>
         </div>  
         <div id="tab_container">
@@ -39,7 +36,7 @@
 		        <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("ID")%>:</div>
+		                    <fmt:message key="label.id"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="id">
@@ -49,7 +46,7 @@
 		        <div class="grid_rows even">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("Type")%>:</div>
+		                    <fmt:message key="label.type"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="type">
@@ -57,10 +54,10 @@
 		            </div>
 		        </div>
 		        
-		         <div class="grid_rows even">
+		         <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    Type ID:</div>
+		                    <fmt:message key="label.type.id"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="typeid">
@@ -68,20 +65,20 @@
 		            </div>
 		        </div>
 		        
-		        <div class="grid_rows odd">
+		        <div class="grid_rows even">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("Description")%>:</div>
+		                    <fmt:message key="label.description"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="description">
 		                    </div>
 		            </div>
 		        </div>
-		        <div class="grid_rows even">
+		        <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("Sent")%>:</div>
+		                    <fmt:message key="label.sent"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="sent">
diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp
index 0525fde5c5f..5990af21dd7 100644
--- a/ui/jsp/cluster.jsp
+++ b/ui/jsp/cluster.jsp
@@ -1,18 +1,16 @@
-<%@ 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_clustericon.gif"/></div>
    
-    <h1>Cluster
-    </h1>
+    <h1><fmt:message key="label.cluster"/></h1>
 </div>
 <div class="contentbox" id="right_panel_content">
     <div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
@@ -21,7 +19,7 @@
     </div>
     <div class="tabbox" style="margin-top:15px;">
         <div class="content_tabs on">
-            <%=t.t("Details")%></div>        
+            <fmt:message key="label.details"/></div>        
     </div>    
     <div id="tab_content_details">
     	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
@@ -29,7 +27,7 @@
                 <div class="rightpanel_mainloader_animatedicon">
                 </div>
                 <p>
-                    Loading &hellip;</p>
+                    <fmt:message key="label.loading"/> &hellip;</p>
             </div>
         </div>   
         <div id="tab_container">
@@ -41,7 +39,7 @@
 	                    <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
 	                        <ul class="actionsdropdown_boxlist" id="action_list">
 	                            <li>
-	                                <%=t.t("no.available.actions")%></li>
+	                                <fmt:message key="label.no.actions"/></li>
 	                        </ul>
 	                    </div>
 	                </div>
@@ -50,13 +48,13 @@
 	                    <div class="gridheader_loader" id="icon">
 	                    </div>
 	                    <p id="description">
-	                        Waiting &hellip;</p>
+	                        <fmt:message key="label.waiting"/> &hellip;</p>
 	                </div>
 	            </div>
 		        <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("ID")%>:</div>
+		                    <fmt:message key="label.id"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="id">
@@ -66,7 +64,7 @@
 		        <div class="grid_rows even">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("name")%>:</div>
+		                    <fmt:message key="label.name"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="name">
@@ -76,7 +74,7 @@
 		        <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("zone")%>:</div>
+		                    <fmt:message key="label.zone"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="zonename">
@@ -86,7 +84,7 @@
 		        <div class="grid_rows even">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("pod")%>:</div>
+		                    <fmt:message key="label.pod"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="podname">
@@ -96,7 +94,7 @@
 		        <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    Hypervisor Type:</div>
+		                    <fmt:message key="label.hypervisor.type"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="hypervisortype">
@@ -106,7 +104,7 @@
 		        <div class="grid_rows even">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    Cluster Type:</div>
+		                    <fmt:message key="label.cluster.type"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="clustertype">
@@ -125,7 +123,7 @@
             <div class="actionpanel_button_icons">
                 <img src="images/addvm_actionicon.png" alt="Add Host" /></div>
             <div class="actionpanel_button_links">
-                Add Host
+                <fmt:message key="label.add.host"/>
             </div>
         </div>
     </div>
@@ -134,7 +132,7 @@
             <div class="actionpanel_button_icons">
                 <img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
             <div class="actionpanel_button_links">
-                Add Primary Storage
+                <fmt:message key="label.add.primarystorage"/>
             </div>
         </div>
     </div>
@@ -143,26 +141,14 @@
 
 <!-- Add Host Dialog -->
 <div id="dialog_add_host" title="Add Host" style="display: none">
-    <p>
-        Add a host for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name">
-        </span></b>
+    <p><fmt:message key="message.add.host"/> 
     </p>
     <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>										
-                </select>
-            </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;">
@@ -170,56 +156,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="user_name">
-                    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.address"/>:</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.vcenter.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>
@@ -232,7 +218,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.  -->
@@ -246,15 +232,14 @@
 <!-- Add Primary Storage Dialog -->
 <div id="dialog_add_pool" title="Add Primary Storage" style="display: none">
     <p>
-        Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span
-            id="pod_name"></span></b>
+		<fmt:message key="message.add.primary"/>
     </p>
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>
             <li id="pool_cluster_container">
                 <label for="pool_cluster">
-                    Cluster:</label>
+                    <fmt:message key="label.cluster"/>:</label>
                 <select class="select" id="pool_cluster">
                 </select>
                 <div id="pool_cluster_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -262,65 +247,65 @@
             </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>
-                    <option value="vmfs">VMFS</option>
+                    <option value="nfs"><fmt:message key="label.nfs"/></option>
+                    <option value="iscsi"><fmt:message key="label.iscsi"/></option>
+                    <option value="vmfs"><fmt:message key="label.vmfs"/></option>
                 </select>
             </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>
@@ -333,7 +318,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.  -->