diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index fda4e2d997e..f4e6dc1dbe7 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,17 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.port=Port
+label.remove.ldap=Remove LDAP
+message.remove.ldap=Are you sure you want to delete the LDAP configuration?
+label.configure.ldap=Configure LDAP
+message.configure.ldap=Please confirm you would like to configure LDAP.
+label.ldap.configuration=LDAP Configuration
+label.ldap.port=LDAP port
+label.create.nfs.secondary.staging.store=Create NFS secondary staging store
+label.volatile=Volatile
+label.planner.mode=Planner mode
+label.deployment.planner=Deployment planner
 label.quiesce.vm=Quiesce VM
 label.smb.username=SMB Username
 label.smb.password=SMB Password
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 8e75969906c..8490f1bdf35 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,17 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script type="text/javascript">
 dictionary = {
+'label.port': '<fmt:message key="label.port" />',
+'label.remove.ldap': '<fmt:message key="label.remove.ldap" />',
+'message.remove.ldap': '<fmt:message key="message.remove.ldap" />',
+'message.configure.ldap': '<fmt:message key="message.configure.ldap" />',
+'label.configure.ldap': '<fmt:message key="label.configure.ldap" />',
+'label.ldap.port': '<fmt:message key="label.ldap.port" />',
+'label.ldap.configuration': '<fmt:message key="label.ldap.configuration" />',
+'label.create.nfs.secondary.staging.store': '<fmt:message key="label.create.nfs.secondary.staging.store" />',
+'label.volatile': '<fmt:message key="label.volatile" />',
+'label.planner.mode': '<fmt:message key="label.planner.mode" />',
+'label.deployment.planner': '<fmt:message key="label.deployment.planner" />',
 'label.quiesce.vm': '<fmt:message key="label.quiesce.vm" />',
 'label.smb.username': '<fmt:message key="label.smb.username" />',
 'label.smb.password': '<fmt:message key="label.smb.password" />',
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 8144466546a..d73bd60ffa8 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -197,14 +197,14 @@
                                     },
 
                                     isVolatile: {
-                                        label: 'isVolatile',
+                                        label: 'label.volatile',
                                         isBoolean: true,
                                         isChecked: false
 
                                     },
 
                                     deploymentPlanner: {
-                                        label: 'Deployment Planner',
+                                        label: 'label.deployment.planner',
                                         select: function(args) {
                                             $.ajax({
                                                 url: createURL('listDeploymentPlanners'),
@@ -233,7 +233,7 @@
 
                                     // plannerKey:{label:'Planner Key' , docID:'helpImplicitPlannerKey'},
                                     plannerMode: {
-                                        label: 'Planner Mode',
+                                        label: 'label.planner.mode',
                                         select: function(args) {
                                             var items = [];
                                             items.push({
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index 0e3d1ef883d..f5f150f70d6 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -101,16 +101,16 @@
             },
             ldapConfiguration: {
                 type: 'select',
-                title: 'LDAP Configuration',
+                title: 'label.ldap.configuration',
                 listView: {
                     id: 'ldap',
-                    label: 'LDAP Configuration',
+                    label: 'label.ldap.configuration',
                     fields: {
                         hostname: {
-                            label: 'Hostname'
+                            label: 'label.host.name'
                         },
                         port: {
-                            label: 'LDAP Port'
+                            label: 'label.ldap.port'
                         }
                     },
                     dataProvider: function(args) {
@@ -134,13 +134,13 @@
                         name: 'label.details',
                         actions: {
                             remove: {
-                                label: 'Remove LDAP',
+                                label: 'label.remove.ldap',
                                 messages: {
                                     notification: function(args) {
-                                        return 'LDAP Configuration Deleted';
+                                        return 'label.remove.ldap';
                                     },
                                     confirm: function() {
-                                        return 'Are you sure you want to delete the LDAP configuration?';
+                                        return 'message.remove.ldap';
                                     }
                                 },
                                 action: function(args) {
@@ -156,13 +156,13 @@
                         },
                         tabs: {
                             details: {
-                                title: 'LDAP Configuration Details',
+                                title: 'label.ldap.configuration',
                                 fields: [{
                                     hostname: {
-                                        label: 'Hostname'
+                                        label: 'label.host.name'
                                     },
                                     port: {
-                                        label: 'Port'
+                                        label: 'label.port'
                                     }
                                 }],
                                 dataProvider: function(args) {
@@ -185,27 +185,26 @@
                     },
                     actions: {
                         add: {
-                            label: 'Configure LDAP',
+                            label: 'label.configure.ldap',
                             messages: {
                                 confirm: function(args) {
-                                    return 'Do you really want to configure LDAP ? ';
+                                    return 'message.configure.ldap';
                                 },
                                 notification: function(args) {
-                                    console.log(args);
-                                    return 'Successfully added a new LDAP server';
+                                    return 'label.configure.ldap';
                                 }
                             },
                             createForm: {
-                                title: 'Configure LDAP',
+                                title: 'label.configure.ldap',
                                 fields: {
                                     hostname: {
-                                        label: 'Hostname',
+                                        label: 'label.host.name',
                                         validation: {
                                             required: true
                                         }
                                     },
                                     port: {
-                                        label: 'Port',
+                                        label: 'label.port',
                                         validation: {
                                             required: true
                                         }
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f4b038811e5..6656fc17b00 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -14514,7 +14514,7 @@
 
 
                                     hypervisor: {
-                                        label: 'Hypervisor',
+                                        label: 'label.hypervisor',
                                         isHidden: true,
                                         select: function(args) {
                                             var items = [];
@@ -14535,7 +14535,7 @@
                                     },
 
                                     zoneid: {
-                                        label: 'Zone',
+                                        label: 'label.zone',
                                         docID: 'helpPrimaryStorageZone',
                                         validation: {
                                             required: true
@@ -16478,7 +16478,7 @@
                                             },
 
                                             createNfsCache: {
-                                                label: 'Create NFS Secondary Staging Store',
+                                                label: 'label.create.nfs.secondary.staging.store',
                                                 isBoolean: true,
                                                 isChecked: true
                                             },