From f58cec83c67907ad67fc556c7d152b27b30b7cee Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Fri, 17 Feb 2012 16:01:04 -0800
Subject: [PATCH] bug 13702

Fix missing labels for instance state/actions
---
 client/WEB-INF/classes/resources/messages.properties    | 1 +
 client/WEB-INF/classes/resources/messages_ja.properties | 1 +
 ui/index.jsp                                            | 1 +
 ui/scripts/instances.js                                 | 6 +++---
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index c461a382272..45b46b284b4 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,4 +1,5 @@
 #new labels (begin) **********************************************************************************************
+state.Stopping=Stopping
 message.add.load.balancer.under.ip=The load balancer rule has been added under IP:
 message.select.instance=Please select an instance.
 label.select=Select
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 2dc4beb90ae..5dfb3db092d 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -1,4 +1,5 @@
 #new labels (begin) **********************************************************************************************
+state.Stopping=停止
 message.add.load.balancer.under.ip=ロードバランサのルールは、IPの下に追加されました。
 message.select.instance=インスタンスを選択してください。
 label.select=選択する
diff --git a/ui/index.jsp b/ui/index.jsp
index 6bedb94f7e7..684d3af61f3 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1614,6 +1614,7 @@
 
 <script language="javascript">
 dictionary = {
+'state.Stopping': '<fmt:message key="state.Stopping"/>',
 'message.add.load.balancer.under.ip': '<fmt:message key="message.add.load.balancer.under.ip"/>',
 'message.select.instance': '<fmt:message key="message.select.instance"/>',
 'label.select': '<fmt:message key="label.select"/>',
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index c40f2d94dbb..243751e66e5 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -560,7 +560,7 @@
               return 'message.action.start.instance';
             },
             notification: function(args) {
-              return 'message.notification.start.instance';
+              return 'label.action.start.instance';
             }
           },
           notification: {
@@ -611,7 +611,7 @@
             },
 
             notification: function(args) {
-              return 'message.notification.stop.instance';
+              return 'label.action.stop.instance';
             }
           },
           notification: {
@@ -647,7 +647,7 @@
               return 'message.action.reboot.instance';
             },
             notification: function(args) {
-              return 'message.notification.reboot.instance';
+              return 'instances.actions.reboot.label';
             }
           },
           notification: {