diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 07c8c3e4f2f..8ba6fd79ca7 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,3 +1,4 @@
+label.change.value=Change value
 label.clear.list=Clear list
 label.full.path=Full path
 message.add.domain=Please specify the subdomain you want to create under this domain
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 26506900b76..dff1eec9638 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -1,4 +1,5 @@
 #cloudstack 3.0 (begin) ********************************************************************************************
+label.change.value=値を変更する
 label.clear.list=一覧をクリアする
 label.full.path=フルパス
 message.add.domain=このドメインの下に作成するサブドメインを指定してください
diff --git a/ui/index.jsp b/ui/index.jsp
index 1f7ce1b31ba..4f328435184 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1599,6 +1599,7 @@
 
 <script language="javascript">
 dictionary = {
+'label.change.value': '<fmt:message key="label.change.value"/>',
 'label.clear.list': '<fmt:message key="label.clear.list"/>',
 'label.add.vm': '<fmt:message key="label.add.vm"/>',
 'label.full.path': '<fmt:message key="label.full.path"/>',
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index e543b5926be..c315ca148fe 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -1,12 +1,12 @@
 (function(cloudStack) {
   cloudStack.sections['global-settings'] = {
-    title: 'Global Settings',
+    title: 'label.menu.global.settings',
     id: 'global-settings',
     listView: {
-      label: 'Global Settings',
+      label: 'label.menu.global.settings',
       actions: {
         edit: {
-          label: 'Change value',
+          label: 'label.change.value',
           action: function(args) {           
             var name = args.data.jsonObj.name;
             var value = args.data.value;
@@ -19,7 +19,7 @@
               async: true,
               success: function(json) {                
                 var item = json.updateconfigurationresponse.configuration;
-                cloudStack.dialog.notice({ message: 'Please restart your management server for your change to take effect.' });
+                cloudStack.dialog.notice({ message: _l('message.restart.mgmt.server') });
                 args.response.success({data: item});
               },
               error: function(json) {                
@@ -30,9 +30,9 @@
         }
       },
       fields: {
-        name: { label: 'Name', id: true },
-        description: { label: 'Description' },
-        value: { label: 'Value', editable: true }
+        name: { label: 'label.name', id: true },
+        description: { label: 'label.description' },
+        value: { label: 'label.value', editable: true }
       },
       dataProvider: function(args) {
         var data = {