diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 736f0ff1e6e..f60bf974b66 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,3 +1,5 @@
+state.BackingUp=Backing Up
+state.BackedUp=Backed Up
 label.done=Done
 label.vm.name=VM name
 message.migrate.volume=Please confirm that you want to migrate volume to another primary storage.
diff --git a/ui/index.jsp b/ui/index.jsp
index 5e0ab9eb43d..4d6bc308040 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1599,6 +1599,16 @@
 
 <script language="javascript">
 dictionary = {
+'message.action.delete.snapshot': '<fmt:message key="message.action.delete.snapshot"/>',
+'label.description': '<fmt:message key="label.description"/>',
+'label.volume.name': '<fmt:message key="label.volume.name"/>',
+'label.action.delete.snapshot': '<fmt:message key="label.action.delete.snapshot"/>',
+'label.action.create.volume': '<fmt:message key="label.action.create.volume"/>',
+'label.volume': '<fmt:message key="label.volume"/>',
+'state.BackingUp': '<fmt:message key="state.BackingUp"/>',
+'label.action.take.snapshot': '<fmt:message key="label.action.take.snapshot"/>',
+'state.BackedUp': '<fmt:message key="state.BackedUp"/>',
+'label.interval.type': '<fmt:message key="label.interval.type"/>',
 'label.instance': '<fmt:message key="label.instance"/>',
 'label.add': '<fmt:message key="label.add"/>',
 'label.done': '<fmt:message key="label.done"/>',
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 24547f74247..0d4bea9c811 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -202,13 +202,13 @@
             viewAll: { path: 'storage.snapshots', label: 'label.snapshots' },
             actions: {
               takeSnapshot: {
-                label: 'label.take.snapshot',
+                label: 'label.action.take.snapshot',
                 messages: {
                   confirm: function(args) {
                     return 'message.action.take.snapshot' ;
                   },
                   notification: function(args) {
-                    return 'label.take.snapshot';
+                    return 'label.action.take.snapshot';
                   }
                 },
                 action: function(args) {
@@ -895,20 +895,25 @@
        */
       snapshots: {
         type: 'select',
-        title: 'Snapshots',
+        title: 'label.snapshots',
         listView: {
           id: 'snapshots',
-          label: 'Snapshots',
+          label: 'label.snapshots',
           fields: {
-            volumename: { label: 'Volume' },
-            intervaltype: { label: 'Interval Type' },
-            created: { label: 'Date', converter: cloudStack.converters.toLocalDate },
+            volumename: { label: 'label.volume' },
+            intervaltype: { label: 'label.interval.type' },
+            created: { label: 'label.created', converter: cloudStack.converters.toLocalDate },
             state: {
               converter: function(str) {
                 // For localization
-                return str;
+                return 'state.'+str;
               },
-              label: 'State', indicator: { 'BackedUp': 'on', 'Destroyed': 'off' }
+              label: 'label.state', indicator: {
+                converter: function(str) {
+                  return 'state.' + str;
+                },
+                'BackedUp': 'on', 'Destroyed': 'off'
+              }
             }
           },
 
@@ -950,23 +955,23 @@
             name: 'Snapshot detail',
             actions: {
               createTemplate: {
-                label: 'Create template',
+                label: 'label.create.template',
                 messages: {
                   confirm: function(args) {
-                    return 'Are you sure you want to create template?';
+                    return 'message.create.template';
                   },
                   notification: function(args) {
-                    return 'Create template';
+                    return 'label.create.template';
                   }
                 },
                 createForm: {
-                  title: 'Create Template',
+                  title: 'label.create.template',
                   desc: '',
                   fields: {
-                    name: { label: 'Name', validation: { required: true }},
-                    displayText: { label: 'Description', validation: { required: true }},
+                    name: { label: 'label.name', validation: { required: true }},
+                    displayText: { label: 'label.description', validation: { required: true }},
                     osTypeId: {
-                      label: 'OS Type',
+                      label: 'label.os.type',
                       select: function(args) {
                         $.ajax({
                           url: createURL("listOsTypes"),
@@ -983,8 +988,8 @@
                         });
                       }
                     },
-                    isPublic: { label: 'Public', isBoolean: true },
-                    isPasswordEnabled: { label: 'Password enabled', isBoolean: true }
+                    isPublic: { label: 'label.public', isBoolean: true },
+                    isPasswordEnabled: { label: 'label.password.enabled', isBoolean: true }
                   }
                 },
                 action: function(args) {
@@ -1031,21 +1036,21 @@
               },
 
               createVolume: {
-                label: 'Create volume',
+                label: 'label.action.create.volume',
                 messages: {
                   confirm: function(args) {
                     return 'Are you sure you want to create volume?';
                   },
                   notification: function(args) {
-                    return 'Create volume';
+                    return 'label.action.create.volume';
                   }
                 },
                 createForm: {
-                  title: 'Create volume',
+                  title: 'label.action.create.volume',
                   desc: '',
                   fields: {
                     name: {
-                      label: 'Name',
+                      label: 'label.name',
                       validation: {
                         required: true
                       }
@@ -1083,13 +1088,13 @@
               },
 
               'destroy': {
-                label: 'Delete snapshot',
+                label: 'label.action.delete.snapshot',
                 messages: {
                   confirm: function(args) {
-                    return 'Are you sure you want to delete snapshot?';
+                    return 'message.action.delete.snapshot';
                   },
                   notification: function(args) {
-                    return 'Delete snapshot';
+                    return 'label.action.delete.snapshot';
                   }
                 },
                 action: function(args) {
@@ -1117,20 +1122,19 @@
             },
             tabs: {
               details: {
-                title: 'Details',
+                title: 'label.details',
                 fields: [
                   {
-                    name: { label: 'Name' }
+                    name: { label: 'label.name' }
                   },
                   {
-                    id: { label: 'ID' },
-                    name: { label: 'Name' },
-                    volumename: { label: 'Volume Name' },
-                    state: { label: 'State' },
-                    intervaltype: { label: 'Interval Type' },
-                    domain: { label: 'Domain' },
-                    account: { label: 'Account' },
-                    created: { label: 'Created', converter: cloudStack.converters.toLocalDate }
+                    id: { label: 'label.id' },
+                    volumename: { label: 'label.volume.name' },
+                    state: { label: 'label.state' },
+                    intervaltype: { label: 'label.interval.type' },
+                    domain: { label: 'label.domain' },
+                    account: { label: 'label.account' },
+                    created: { label: 'label.created', converter: cloudStack.converters.toLocalDate }
                   }
                 ],