diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 7ee58324d18..de46afdbb70 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -425,7 +425,6 @@ label.add.primary.storage=Add Primary Storage
 label.add.secondary.storage=Add Secondary Storage
 label.add.security.group=Add Security Group
 label.add.service.offering=Add Service Offering
-label.add.system.service.offering=Add System Service Offering
 label.add.template=Add Template
 label.add.user=Add User
 label.add.vlan=Add VLAN
@@ -644,7 +643,6 @@ label.menu.physical.resources=Physical Resources
 label.menu.running.instances=Running Instances
 label.menu.security.groups=Security Groups
 label.menu.service.offerings=Service Offerings
-label.menu.system.service.offerings=System Service Offerings
 label.menu.snapshots=Snapshots
 label.menu.stopped.instances=Stopped Instances
 label.menu.storage=Storage
@@ -1008,5 +1006,11 @@ hypervisor.version=Hypervisor version
 max.guest.limit=Max guest limit
 security.group.enabled=Security group enabled
 add.network.offering=Add network offering
-services=Services
-service.capabilities=Service Capabilities
\ No newline at end of file
+supported.services=Supported Services
+service.capabilities=Service Capabilities
+guest.type=Guest Type
+specify.IP.ranges=Specify IP ranges
+conserve.mode=Conserve mode
+created.by.system=Created by system
+label.menu.system.service.offerings=System Service Offerings
+label.add.system.service.offering=Add System Service Offering
\ No newline at end of file
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 9f38df60474..521656640af 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -862,4 +862,23 @@ error.menu.select=アイテムが選択されていないためアクション
 error.mgmt.server.inaccessible=Management Serverにアクセスできません。後で、もう一度やり直してください
 error.session.expired=セッション有効期限が切れています
 error.unresolved.internet.name=名前解決に失敗しました
-#cloudstack 2.2.Y (end) ********************************************************************************************
\ No newline at end of file
+#cloudstack 2.2.Y (end) ********************************************************************************************
+
+
+#Jes
+message.add.system.service.offering=新しいシステム·サービスの提供を追加するには、次のデータを記入してください。
+message.action.delete.system.service.offering=このシステムサービスの提供を削除することを確認してください。
+label.action.delete.system.service.offering=削除システムサービスの提供
+hypervisor.capabilities=機能をハイパーバイザ
+hypervisor.version=のバージョンをハイパーバイザ
+max.guest.limit=最大ゲストの制限
+security.group.enabled=セキュリティグループが有効になって
+add.network.offering=ネットワークの提供を追加します。
+supported.services=サポートされているサービス
+service.capabilities=サービス機能
+guest.type=ゲストの種類
+specify.IP.ranges=指定したIPの範囲
+conserve.mode=モードを節約
+created.by.system=システムによって作成され
+label.menu.system.service.offerings=システムサービスの提供
+label.add.system.service.offering=システムサービスの提供を追加します。
\ No newline at end of file
diff --git a/ui/index.jsp b/ui/index.jsp
index 92784db48f8..f7fc918b43d 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2207,7 +2207,6 @@ dictionary = {
 'label.menu.running.instances': '<fmt:message key="label.menu.running.instances" />',
 'label.menu.security.groups': '<fmt:message key="label.menu.security.groups" />',
 'label.menu.service.offerings': '<fmt:message key="label.menu.service.offerings" />',
-'label.menu.system.service.offerings': '<fmt:message key="label.menu.system.service.offerings" />',
 'label.menu.snapshots': '<fmt:message key="label.menu.snapshots" />',
 'label.menu.stopped.instances': '<fmt:message key="label.menu.stopped.instances" />',
 'label.menu.storage': '<fmt:message key="label.menu.storage" />',
@@ -2557,6 +2556,22 @@ dictionary = {
 'error.menu.select': '<fmt:message key="error.menu.select" />',
 'error.mgmt.server.inaccessible': '<fmt:message key="error.mgmt.server.inaccessible" />',
 'error.session.expired': '<fmt:message key="error.session.expired" />',
-'error.unresolved.internet.name': '<fmt:message key="error.unresolved.internet.name" />'
+'error.unresolved.internet.name': '<fmt:message key="error.unresolved.internet.name" />',
+'message.add.system.service.offering': '<fmt:message key="message.add.system.service.offering" />', //Jes
+'message.action.delete.system.service.offering': '<fmt:message key="message.action.delete.system.service.offering" />',
+'label.action.delete.system.service.offering': '<fmt:message key="label.action.delete.system.service.offering" />',
+'hypervisor.capabilities': '<fmt:message key="hypervisor.capabilities" />',
+'hypervisor.version': '<fmt:message key="hypervisor.version" />',
+'max.guest.limit': '<fmt:message key="max.guest.limit" />',
+'security.group.enabled': '<fmt:message key="security.group.enabled" />',
+'add.network.offering': '<fmt:message key="add.network.offering" />',
+'supported.services': '<fmt:message key="supported.services" />',
+'service.capabilities': '<fmt:message key="service.capabilities" />',
+'guest.type': '<fmt:message key="guest.type" />',
+'specify.IP.ranges': '<fmt:message key="specify.IP.ranges" />',
+'conserve.mode': '<fmt:message key="conserve.mode" />',
+'created.by.system': '<fmt:message key="created.by.system" />',
+'label.menu.system.service.offerings': '<fmt:message key="label.menu.system.service.offerings" />',
+'label.add.system.service.offering': '<fmt:message key="label.add.system.service.offering" />'
 };
 </script>
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 29bccb22116..a8ae7fe64a9 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1106,7 +1106,7 @@
                   },
 
                   guestIpType: {
-                    label: 'Guest Type',
+                    label: 'guest.type',
                     select: function(args) {
                       args.response.success({
                         data: [
@@ -1127,10 +1127,10 @@
                     }
                   },
 
-                  specifyVlan: { label: 'Specify VLAN', isBoolean: true },																
+                  specifyVlan: { label: 'label.specify.vlan', isBoolean: true },																
 								
                   supportedServices: {
-                    label: 'Supported Services',
+                    label: 'supported.services',
 
                     dynamic: function(args) {
                       $.ajax({
@@ -1327,12 +1327,12 @@
                   //show or hide upon checked services and selected providers above (end)
 									
 									
-									conservemode: { label: 'Conserve mode', isBoolean: true },
+									conservemode: { label: 'conserve.mode', isBoolean: true },
 									
-                  tags: { label: 'Tags' },
+                  tags: { label: 'label.tags' },
 									
 									availability: {
-                    label: 'Availability',
+                    label: 'label.availability',
                     isHidden: true,  
                     select: function(args) {
                       args.response.success({
@@ -1632,10 +1632,10 @@
                     },
                     state: { label: 'label.state' },
                     guestiptype: {
-                      label: 'Guest type'
+                      label: 'guest.type'
                     },
                     availability: {
-                      label: 'Availability',
+                      label: 'label.availability',
                       isEditable: true,
                       select: function(args) {
                         var items = [];
@@ -1646,19 +1646,19 @@
                       }
                     },
                     isdefault: { //created by system by default
-                      label: 'Created by system',
+                      label: 'created.by.system',
                       converter: cloudStack.converters.toBooleanText
                     },
                     specifyvlan: {
-                      label: 'Specify VLAN',
+                      label: 'label.specify.vlan',
                       converter: cloudStack.converters.toBooleanText
                     },
 										specifyipranges: { 
-										  label: 'Specify IP ranges', 
+										  label: 'specify.IP.ranges', 
 											converter: cloudStack.converters.toBooleanText
 										},
 										conservemode: {
-                      label: 'Conserve mode',
+                      label: 'conserve.mode',
                       converter: cloudStack.converters.toBooleanText
                     },
                     networkrate: {
@@ -1678,7 +1678,7 @@
                       label: 'label.traffic.type'
                     },
                     supportedServices: {
-                      label: 'services'
+                      label: 'supported.services'
                     },
                     serviceCapabilities: {
                       label: 'service.capabilities'