diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 7d3fcd78cfd..8c88a237f55 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,3 +1,26 @@
+label.networks=Networks
+label.launch.vm=Launch VM
+label.new.vm=New VM
+label.previous=Previous
+label.add.to.group=Add to group
+message.vm.review.launch=Please review the following information and confirm that your virtual instance is correct before launch.
+message.select.security.groups=Please select security group(s) for your new VM
+label.new=New
+message.please.select.networks=Please select networks for your virtual machine.
+message.please.proceed=Please proceed to the next step.
+message.zone.no.network.selection=The zone you selected does not have any choices for network selection.
+label.no.thanks=No thanks
+label.my.templates=My templates
+message.select.template=Please select a template for your new virtual instance.
+message.select.iso=Please select an ISO for your new virtual instance.
+message.template.desc=OS image that can be used to boot VMs
+message.iso.desc=Disc image containing data or bootable media for OS
+label.select.iso.or.template=Select ISO or template
+message.select.a.zone=A zone typically corresponds to a single datacenter. Multiple zones help make the cloud more reliable by providing physical isolation and redundancy.
+label.select.a.zone=Select a zone
+label.review=Review
+label.select.a.template=Select a template
+label.setup=Setup
 state.Allocated=Allocated
 changed.item.properties=Changed item properties
 label.apply=Apply
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index b5678ecdb77..4b1d47fa12e 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -1,4 +1,27 @@
 #cloudstack 3.0 (begin) ********************************************************************************************
+label.networks=ネットワーク
+label.launch.vm=VMを起動します。
+label.new.vm=新しいVM
+label.previous=前
+label.add.to.group=グループに追加する
+message.vm.review.launch=次の情報を確認して、仮想インスタンスが起動する前に、正しいことを確認してください。
+message.select.security.groups=新しいVMのセキュリティグループを選択してください。
+label.new=新しい
+message.please.select.networks=仮想マシンのネットワークを選択してください。
+message.please.proceed=次のステップに進んでください。
+message.zone.no.network.selection=あなたが選択したゾーンは、ネットワークの選択の任意の選択肢を持っていません。
+label.no.thanks=遠慮します
+label.my.templates=私のテンプレート
+message.select.template=新しい仮想インスタンス用のテンプレートを選択してください。
+message.select.iso=新しい仮想インスタンスは、ISOを選択してください。
+message.template.desc=VMを起動するために使用することができ、OSイメージ
+message.iso.desc=データやOSのブータブルメディアを含むディスクイメージ
+label.select.iso.or.template=を選択し、ISOまたはテンプレート
+message.select.a.zone=ゾーンは、通常、単一のデータセンターに対応しています。複数のゾーンは、物理的な隔離と冗長性を提供することにより、クラウドの信頼性を高める。
+label.select.a.zone=ゾーンを選択します
+label.review=レビュー
+label.select.a.template=テンプレートを選択します。
+label.setup=セットアップ
 state.Allocated=割り当てられた
 changed.item.properties=変更された項目のプロパティ
 label.apply=適用される
diff --git a/ui/index.jsp b/ui/index.jsp
index 09493d46a6e..d8a88d2d567 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1,7 +1,7 @@
 <%@ 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}" />
+  <fmt:setLocale value="${cookie.lang.value}" />
 </c:if>
 <fmt:setBundle basename="resources/messages"/>
 
@@ -58,12 +58,12 @@
       <div class="multi-wizard instance-wizard">
         <div class="progress">
           <ul>
-            <li class="first"><span class="number">1</span><span>Setup</span><span class="arrow"></span></li>
-            <li><span class="number">2</span><span class="multiline">Select a template</span><span class="arrow"></span></li>
-            <li><span class="number">3</span><span class="multiline">Service Offering</span><span class="arrow"></span></li>
-            <li><span class="number">4</span><span class="multiline">Data Disk Offering</span><span class="arrow"></span></li>
-            <li><span class="number">5</span><span>Network</span><span class="arrow"></span></li>
-            <li class="last"><span class="number">6</span><span>Review</span></li>
+            <li class="first"><span class="number">1</span><span><fmt:message key="label.setup"/></span><span class="arrow"></span></li>
+            <li><span class="number">2</span><span class="multiline"><fmt:message key="label.select.a.template"/></span><span class="arrow"></span></li>
+            <li><span class="number">3</span><span class="multiline"><fmt:message key="label.service.offering"/></span><span class="arrow"></span></li>
+            <li><span class="number">4</span><span class="multiline"><fmt:message key="label.data.disk.offering"/></span><span class="arrow"></span></li>
+            <li><span class="number">5</span><span><fmt:message key="label.menu.network"/></span><span class="arrow"></span></li>
+            <li class="last"><span class="number">6</span><span><fmt:message key="label.review"/></span></li>
           </ul>
         </div>
         <form>
@@ -73,27 +73,27 @@
               <div class="content">
                 <!-- Select a zone -->
                 <div class="section select-zone">
-                  <h3>Select a zone</h3>
-                  <p>A zone typically corresponds to a single datacenter. Multiple zones help make the cloud more reliable by providing physical isolation and redundancy.</p>
+                  <h3><fmt:message key="label.select.a.zone"/></h3>
+                  <p><fmt:message key="message.select.a.zone"/></p>
                   <div class="select-area">
                     <div class="desc"></div>
                     <select name="zoneid" class="required">
-                      <option default="default" value="" >Select a zone</option>
+                      <option default="default" value="" ><fmt:message key="label.select.a.zone"/></option>
                     </select>
                   </div>
                 </div>
 
                 <!-- Select template -->
                 <div class="section select-template">
-                  <h3>Select ISO or template</h3>
+                  <h3><fmt:message key="label.select.iso.or.template" /></h3>
                   <p></p>
                   <div class="select-area">
-                    <div class="desc">OS image that can be used to boot VMs</div>
+                    <div class="desc"><fmt:message key="message.template.desc"/></div>
                     <input type="radio" name="select-template" value="select-template" />
-                    <label>Template</label>
+                    <label><fmt:message key="label.template"/></label>
                   </div>
                   <div class="select-area">
-                    <div class="desc">Disc image containing data or bootable media for OS</div>
+                    <div class="desc"><fmt:message key="message.iso.desc"/></div>
                     <input type="radio" name="select-template" value="select-iso" />
                     <label>ISO</label>
                   </div>
@@ -106,15 +106,13 @@
               <!-- Select template -->
               <div class="wizard-step-conditional select-template">
                 <div class="main-desc">
-                  <p>
-                    Please select a template for your new virtual instance.
-                  </p>
+                  <p><fmt:message key="message.select.template"/></p>
                 </div>
                 <div class="template-select content tab-view">
                   <ul>
-                    <li class="first"><a href="#instance-wizard-featured-templates">Featured</a></li>
-                    <li><a href="#instance-wizard-community-templates">Community</a></li>
-                    <li class="last"><a href="#instance-wizard-my-templates">My Template</a></li>
+                    <li class="first"><a href="#instance-wizard-featured-templates"><fmt:message key="label.featured"/></a></li>
+                    <li><a href="#instance-wizard-community-templates"><fmt:message key="label.community"/></a></li>
+                    <li class="last"><a href="#instance-wizard-my-templates"><fmt:message key="label.my.templates"/></a></li>
                   </ul>
 
                   <div id="instance-wizard-featured-templates">
@@ -135,39 +133,36 @@
               <!-- Select ISO -->
               <div class="wizard-step-conditional select-iso">
                 <div class="main-desc">
-                  <p>
-                    Please select an ISO for your new virtual instance.
-                    You can also choose to upload your own iso as well.
-                  </p>
+                  <p><fmt:message key="message.select.iso"/></p>
                 </div>
-                <div class="iso-select content tab-view">                  									
-									<ul>
-									  <li class="first"><a href="#instance-wizard-featured-isos">Featured</a></li>
-                    <li><a href="#instance-wizard-community-isos">Community</a></li>
-                    <li class="last"><a href="#instance-wizard-my-isos">My ISO</a></li>		
+                <div class="iso-select content tab-view">
+                  <ul>
+                    <li class="first"><a href="#instance-wizard-featured-isos"><fmt:message key="label.featured"/></a></li>
+                    <li><a href="#instance-wizard-community-isos"><fmt:message key="label.community"/></a></li>
+                    <li class="last"><a href="#instance-wizard-my-isos"><fmt:message key="label.menu.my.isos"/></a></li>
                   </ul>
-									<div id="instance-wizard-featured-isos">
+                  <div id="instance-wizard-featured-isos">
                     <div class="select-container">
                     </div>
                   </div>
-									<div id="instance-wizard-community-isos">
+                  <div id="instance-wizard-community-isos">
                     <div class="select-container">
                     </div>
                   </div>
-									<div id="instance-wizard-my-isos">
+                  <div id="instance-wizard-my-isos">
                     <div class="select-container">
                     </div>
                   </div>
-																											
-									<!--
-									<ul>
+
+                  <!--
+                  <ul>
                     <li class="first last"><a href="#instance-wizard-all-isos">All ISOs</a></li>
                   </ul>
                   <div id="instance-wizard-all-isos">
                     <div class="select-container">
                     </div>
                   </div>
-									-->
+                  -->
                 </div>
               </div>
             </div>
@@ -185,7 +180,7 @@
               <div class="content">
                 <div class="section no-thanks">
                   <input type="radio" name="diskofferingid" value="0" />
-                  <label>No thanks</label>
+                  <label><fmt:message key="label.no.thanks"/></label>
                 </div>
 
                 <!-- Existing offerings -->
@@ -194,7 +189,7 @@
 
                 <!-- Custom size slider -->
                 <div class="section custom-size">
-                  <label>Disk size</label>
+                  <label><fmt:message key="label.disk.size"/></label>
 
                   <!-- Slider -->
                   <label class="size">1 GB</label>
@@ -211,21 +206,19 @@
             <div class="step network" wizard-step-id="network">
               <!-- 5a: Network description -->
               <div class="wizard-step-conditional nothing-to-select">
-                <p>The zone you selected does not have any choices for network selection</p>               
-                <p>Please proceed to the next step.</p>
+                <p><fmt:message key="message.zone.no.network.selection"/></p>
+                <p><fmt:message key="message.please.proceed"/></p>
               </div>
 
               <!-- 5b: Select network -->
               <div class="wizard-step-conditional select-network">
                 <div class="content">
-                  <div class="main-desc">
-                    Please select networks for your virtual machine
-                  </div>
+                  <div class="main-desc"><fmt:message key="message.please.select.networks"/></div>
                   <div class="select my-networks">
                     <table>
                       <thead>
                         <tr>
-                          <th>Networks</th>
+                          <th><fmt:message key="label.networks"/></th>
                         </tr>
                       </thead>
                       <tbody>
@@ -242,7 +235,7 @@
                     <table>
                       <thead>
                         <tr>
-                          <th>Add new network</th>
+                          <th><fmt:message key="label.add.network"/></th>
                         </tr>
                       </thead>
                       <tbody>
@@ -256,12 +249,12 @@
                                        checked="checked" />
                                 <!-- Default (NEW) -->
                                 <div class="select-desc hide-if-selected">
-                                  <div class="name">NEW</div>
+                                  <div class="name"><fmt:message key="label.new"/></div>
                                 </div>
 
                                 <!-- Name -->
                                 <div class="field name hide-if-unselected">
-                                  <div class="name">Name</div>
+                                  <div class="name"><fmt:message key="label.name"/></div>
                                   <div class="value">
                                     <input type="text" class="required" name="new-network-name" />
                                   </div>
@@ -269,7 +262,7 @@
 
                                 <!-- Service offering -->
                                 <div class="select-desc field service-offering hide-if-unselected">
-                                  <div class="name">Network Offering</div>
+                                  <div class="name"><fmt:message key="label.service.offering"/></div>
                                   <div class="desc">
                                     <select name="new-network-networkofferingid">
                                     </select>
@@ -278,7 +271,7 @@
 
                                 <div class="secondary-input hide-if-unselected">
                                   <input type="radio" name="defaultNetwork" value="new-network" />
-                                  <div class="name">Default</div>
+                                  <div class="name"><fmt:message key="label.default"/></div></div>
                                 </div>
                               </div>
                             </div>
@@ -293,7 +286,7 @@
               <!-- Step 5c: Select security group -->
               <div class="wizard-step-conditional select-security-group">
                 <div class="main-desc">
-                  Please select security group(s) for your new virtual instance
+                  <fmt:message key="message.select.security.groups"/>
                 </div>
                 <div class="content security-groups">
                   <div class="select-container">
@@ -305,14 +298,14 @@
             <!-- Step 6: Review -->
             <div class="step review" wizard-step-id="review">
               <div class="main-desc">
-                Please review the following information and confirm that your virtual instance is correct before launch
+                <fmt:message key="message.vm.review.launch"/>
               </div>
               <div class="content">
                 <div class="select-container">
                   <!-- Name -->
                   <div class="select vm-instance-name">
                     <div class="name">
-                      <span>Name (optional)</span>
+                      <span><fmt:message key="label.name"/> (<fmt:message key="label.optional"/>)</span>
                     </div>
                     <div class="value">
                       <input type="text" name="displayname" />
@@ -322,7 +315,7 @@
                   <!-- Add to group -->
                   <div class="select odd">
                     <div class="name">
-                      <span>Add to group (optional)</span>
+                      <span><fmt:message key="label.add.to.group"/> (<fmt:message key="label.optional"/></span>
                     </div>
                     <div class="value">
                       <input type="text" name="groupname" />
@@ -332,78 +325,78 @@
                   <!-- Zone -->
                   <div class="select">
                     <div class="name">
-                      <span>Zone</span>
+                      <span><fmt:message key="label.zone"/></span>
                     </div>
                     <div class="value">
                       <span wizard-field="zone"></span>
                     </div>
                     <div class="edit">
-                      <a href="1">Edit</a>
+                      <a href="1"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
 
                   <!-- Hypervisor -->
                   <div class="select odd">
                     <div class="name">
-                      <span>Hypervisor</span>
+                      <span><fmt:message key="label.hypervisor"/></span>
                     </div>
                     <div class="value">
                       <span wizard-field="hypervisor"></span>
                     </div>
                     <div class="edit">
-                      <a href="1">Edit</a>
+                      <a href="1"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
 
                   <!-- Template -->
                   <div class="select">
                     <div class="name">
-                      <span>Template</span>
+                      <span><fmt:message key="label.template"/></span>
                     </div>
                     <div class="value">
                       <span wizard-field="template"></span>
                     </div>
                     <div class="edit">
-                      <a href="2">Edit</a>
+                      <a href="2"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
 
                   <!-- Service offering -->
                   <div class="select odd">
                     <div class="name">
-                      <span>Service offering</span>
+                      <span><fmt:message key="label.service.offering"/></span>
                     </div>
                     <div class="value">
                       <span wizard-field="service-offering"></span>
                     </div>
                     <div class="edit">
-                      <a href="3">Edit</a>
+                      <a href="3"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
 
                   <!-- Data disk offering -->
                   <div class="select">
                     <div class="name">
-                      <span>Data disk offering</span>
+                      <span><fmt:message key="label.data.disk.offering"/></span>
                     </div>
                     <div class="value">
                       <span wizard-field="disk-offering"></span>
                     </div>
                     <div class="edit">
-                      <a href="4">Edit</a>
+                      <a href="4"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
 
                   <!-- Primary network -->
                   <div class="select odd">
                     <div class="name">
-                      <span>Primary network</span>
+                      <span><fmt:message key="label.primary.storage"/></span>
                     </div>
                     <div class="value">
                       <span wizard-field="default-network"></span>
                     </div>
                     <div class="edit">
-                      <a href="5">Edit</a>
+                      <a href="5"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
                 </div>
@@ -427,9 +420,9 @@
 
         <!-- Buttons -->
         <div class="buttons">
-          <div class="button previous"><span>Previous</span></div>
-          <div class="button cancel"><span>Cancel</span></div>
-          <div class="button next"><span>Next</span></div>
+          <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
+          <div class="button cancel"><span><fmt:message key="label.cancel"/></span></div>
+          <div class="button next"><span><fmt:message key="label.next"/></span></div>
         </div>
       </div>
 
@@ -461,7 +454,7 @@
                   <h3>Set up zone type</h3>
                   <p>Please select a configuration for your zone.</p>
                   <div class="select-area">
-                    <div class="desc">                      
+                    <div class="desc">
                       Provide a single network where each VM instance is assigned an IP directly from the network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering)
                     </div>
                     <input type="radio" name="network-model" value="Basic" checked="checked" />
@@ -627,8 +620,8 @@
             </ul>
 
             <div class="info-desc">
-              Guest network traffic is communication between end-user virtual machines.  
-						</div>
+              Guest network traffic is communication between end-user virtual machines.
+            </div>
             <div class="content input-area">
               <div class="select-container"></div>
             </div>
@@ -1599,6 +1592,29 @@
 
 <script language="javascript">
 dictionary = {
+'label.networks': '<fmt:message key="label.networks"/>',
+'label.launch.vm': '<fmt:message key="label.launch.vm"/>',
+'label.new.vm': '<fmt:message key="label.new.vm"/>',
+'label.previous': '<fmt:message key="label.previous"/>',
+'label.add.to.group': '<fmt:message key="label.add.to.group"/>',
+'message.vm.review.launch': '<fmt:message key="message.vm.review.launch"/>',
+'label.new': '<fmt:message key="label.new"/>',
+'message.select.security.groups': '<fmt:message key="message.select.security.groups"/>',
+'message.please.proceed': '<fmt:message key="message.please.proceed"/>',
+'message.please.select.networks': '<fmt:message key="message.please.select.networks"/>',
+'message.zone.no.network.selection': '<fmt:message key="message.zone.no.network.selection"/>',
+'label.no.thanks': '<fmt:message key="label.no.thanks"/>',
+'label.my.templates': '<fmt:message key="label.my.templates"/>',
+'message.select.iso': '<fmt:message key="message.select.iso"/>',
+'message.select.template': '<fmt:message key="message.select.template"/>',
+'message.template.desc': '<fmt:message key="message.template.desc"/>',
+'message.iso.desc': '<fmt:message key="message.iso.desc"/>',
+'label.select.iso.or.template': '<fmt:message key="label.select.iso.or.template"/>',
+'message.select.a.zone': '<fmt:message key="message.select.a.zone"/>',
+'label.select.a.zone': '<fmt:message key="label.select.a.zone"/>',
+'label.review': '<fmt:message key="label.review"/>',
+'label.select.a.template': '<fmt:message key="label.select.a.template"/>',
+'label.setup': '<fmt:message key="label.setup"/>',
 'state.Allocated': '<fmt:message key="state.Allocated"/>',
 'changed.item.properties': '<fmt:message key="changed.item.properties"/>',
 'label.apply': '<fmt:message key="label.apply"/>',
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 511a06a31ca..4302206f236 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -31,7 +31,7 @@
                 var $loading = $('.list-view').listView('prependItem', {
                   data: [
                     {
-                      name: data.displayname ? data.displayname : 'New VM',
+                      name: data.displayname ? data.displayname : _l('label.new.vm'),
                       zonename: $wizard.find('select[name=zoneid] option').filter(function() {
                         return $(this).val() == data.zoneid;
                       }).html(),
@@ -531,7 +531,7 @@
                     if (fieldName) {
                       $(this).html(fieldName);
                     } else {
-                      $(this).html('(None)');
+                      $(this).html('(' + _l('label.none') + ')');
                     }
                   });
                 }
@@ -574,10 +574,10 @@
 
           // Show launch vm button if last step
           var $nextButton = $wizard.find('.button.next');
-          $nextButton.find('span').html('Next');
+          $nextButton.find('span').html(_l('label.next'));
           $nextButton.removeClass('final');
           if ($targetStep.hasClass('review')) {
-            $nextButton.find('span').html('Launch VM');
+            $nextButton.find('span').html(_l('label.launch.vm'));
             $nextButton.addClass('final');
           }
 
@@ -693,7 +693,7 @@
         });
 
         return $wizard.dialog({
-          title: 'Add instance',
+          title: _l('label.vm.add'),
           width: 800,
           height: 570,
           zIndex: 5000