From 78dc2ecf18e15e0c34ab214162bd9d55fbecfcce Mon Sep 17 00:00:00 2001
From: Pranav Saxena <pranav.saxena@citrix.com>
Date: Tue, 17 Apr 2012 11:06:21 +0530
Subject: [PATCH] CS-13904 : Labels for service offering CPU and memory not
 consistent

---
 client/WEB-INF/classes/resources/messages.properties | 4 ++--
 ui/scripts/sharedFunctions.js                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 3474f44bd03..b913179b888 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -868,7 +868,7 @@ label.code=Code
 label.confirmation=Confirmation
 label.cpu.allocated.for.VMs=CPU Allocated for VMs
 label.cpu.allocated=CPU Allocated
-label.cpu.mhz=CPU (in MHz)
+label.cpu.mhz=CPU 
 label.cpu.utilized=CPU Utilized
 label.cpu=CPU
 label.created=Created
@@ -988,7 +988,7 @@ label.lun=LUN
 label.manage=Manage
 label.maximum=Maximum
 label.memory.allocated=Memory Allocated
-label.memory.mb=Memory (in MB)
+label.memory.mb=Memory
 label.memory.total=Memory Total
 label.memory.used=Memory Used
 label.memory=Memory
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 1424473d529..0b154522cf6 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -285,9 +285,9 @@ cloudStack.converters = {
       return "";
 
     if (hz < 1000) {
-      return hz + " MHZ";
+      return hz + " MHz";
     } else {
-      return (hz / 1000).toFixed(2) + " GHZ";
+      return (hz / 1000).toFixed(2) + " GHz";
     }
   },
   toDayOfWeekDesp: function(dayOfWeek) {