From 0c6bf81c243520c2d4d0d0d51549259a4fa70119 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 23 Jun 2018 12:49:09 +0900
Subject: [PATCH 1/2] fix appearence of retry button of remote branch
 management dialog

---
 editor/js/ui/notifications.js            | 2 +-
 editor/js/ui/projects/projects.js        | 2 +-
 red/api/editor/locales/en-US/editor.json | 1 +
 red/api/editor/locales/ja/editor.json    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/editor/js/ui/notifications.js b/editor/js/ui/notifications.js
index fef2b1610..e232af282 100644
--- a/editor/js/ui/notifications.js
+++ b/editor/js/ui/notifications.js
@@ -96,7 +96,7 @@ RED.notifications = (function() {
         if (options.buttons) {
             var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(n)
             options.buttons.forEach(function(buttonDef) {
-                var b = $('<button>').text(buttonDef.text).click(buttonDef.click).appendTo(buttonSet);
+                var b = $('<button>').html(buttonDef.text).click(buttonDef.click).appendTo(buttonSet);
                 if (buttonDef.id) {
                     b.attr('id',buttonDef.id);
                 }
diff --git a/editor/js/ui/projects/projects.js b/editor/js/ui/projects/projects.js
index 71a19d661..9a98ed05a 100644
--- a/editor/js/ui/projects/projects.js
+++ b/editor/js/ui/projects/projects.js
@@ -1983,7 +1983,7 @@ RED.projects = (function() {
                                     notification.close();
                                 }
                             },{
-                                text: $('<span><i class="fa fa-refresh"></i> Retry</span>'),
+                                text: '<span><i class="fa fa-refresh"></i> ' +RED._("projects.send-req.retry") +'</span>',
                                 click: function() {
                                     body = body || {};
                                     var authBody = {};
diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json
index 65681850f..69e402e0a 100644
--- a/red/api/editor/locales/en-US/editor.json
+++ b/red/api/editor/locales/en-US/editor.json
@@ -795,6 +795,7 @@
             "username": "Username",
             "password": "Password",
             "passphrase": "Passphrase",
+            "retry": "Retry",
             "update-failed": "Failed to update auth",
             "unhandled": "Unhandled error response"
         },
diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json
index d18938123..e884ec842 100644
--- a/red/api/editor/locales/ja/editor.json
+++ b/red/api/editor/locales/ja/editor.json
@@ -785,6 +785,7 @@
             "username": "ユーザ名",
             "password": "パスワード",
             "passphrase": "パスフレーズ",
+            "retry": "リトライ",
             "update-failed": "認証の更新に失敗しました",
             "unhandled": "エラー応答が処理されませんでした"
         },

From 11569d80564c60475883f84b4e83f505e48881c4 Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Mon, 25 Jun 2018 18:48:01 +0900
Subject: [PATCH 2/2] Follow the change of tab interface for UI test

---
 test/editor/pageobjects/workspace/debugTab_page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/editor/pageobjects/workspace/debugTab_page.js b/test/editor/pageobjects/workspace/debugTab_page.js
index c66122d70..3964d3f5d 100644
--- a/test/editor/pageobjects/workspace/debugTab_page.js
+++ b/test/editor/pageobjects/workspace/debugTab_page.js
@@ -15,7 +15,7 @@
  **/
 
 function open() {
-    browser.clickWithWait('#red-ui-tab-debug');
+    browser.clickWithWait('#red-ui-tab-debug-link-button');
 }
 
 function getMessage(index) {