From 350065e42f670bd312e15a0201a9fc5ca6083641 Mon Sep 17 00:00:00 2001
From: JaymenChou <68678251+JaymenChou@users.noreply.github.com>
Date: Fri, 15 Apr 2022 21:21:29 +0800
Subject: [PATCH 1/4] Update zht.json

Minor changes for better understanding of the terms
---
 qortal-ui-core/language/zht.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json
index 8418db87..e8cc7221 100644
--- a/qortal-ui-core/language/zht.json
+++ b/qortal-ui-core/language/zht.json
@@ -150,8 +150,8 @@
     "mchange24": "預計每天可獲得的獎勵",
     "mchange25": "秒",
     "mchange26": "個區塊",
-    "mchange27": "層級",
-    "mchange28": "等級",
+    "mchange27": "等級",
+    "mchange28": "層級",
     "mchange29": "日内",
     "mchange30": "鑄幣者",
     "mchange31": "點擊尋求幫助",
@@ -303,9 +303,9 @@
     "schange15": "已封鎖的網站",
     "schange16": "你目前沒有封鎖任何網站",
     "schange17": "找不到此名稱!",
-    "schange18": "網站中繼模式已啓用。 這意味著當對等方請求時，您的節點將幫助在網絡中傳輸加密網站數據。 您可以通過設置Settings.json文件禁用它",
-    "schange19": "進入",
-    "schange20": "網站中繼模式已禁用，你可在Settings.json文件中啓用它",
+    "schange18": "網站中繼模式已啓用。 這意味著當對等方請求時，您的節點將幫助在網絡中傳輸加密網站數據。 如想禁用此功能，您可以通過添加",
+    "schange19": "到",
+    "schange20": "網站中繼模式已禁用，如想啓用此功能，您可以通過添加",
     "schange21": "發佈網站",
     "schange22": "嘗試關注此註冊名稱時發生錯誤。 請再試一次!",
     "schange23": "嘗試取消關注此註冊名稱時發生錯誤。 請再試一次!",

From b310ba087874722446fcce672d252a31e6fc076f Mon Sep 17 00:00:00 2001
From: JaymenChou <68678251+JaymenChou@users.noreply.github.com>
Date: Fri, 15 Apr 2022 21:23:32 +0800
Subject: [PATCH 2/4] Update zhc.json

Minor Changes for better understanding of some terms
---
 qortal-ui-core/language/zhc.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json
index 3dd6dc95..de7bfbfe 100644
--- a/qortal-ui-core/language/zhc.json
+++ b/qortal-ui-core/language/zhc.json
@@ -150,8 +150,8 @@
     "mchange24": "预计每天可获得的奖励",
     "mchange25": "秒",
     "mchange26": "个区块",
-    "mchange27": "层级",
-    "mchange28": "等级",
+    "mchange27": "等级",
+    "mchange28": "层级",
     "mchange29": "日内",
     "mchange30": "铸币者",
     "mchange31": "点击寻求帮助",
@@ -303,9 +303,9 @@
     "schange15": "已封锁的网站",
     "schange16": "你目前没有封锁任何网站",
     "schange17": "找不到此名称!",
-    "schange18": "网站中继模式已启用。 这意味着当对等方请求时，您的节点将帮助在网络中传输加密网站数据。 您可以通过设置Settings.json文件禁用它",
-    "schange19": "进入",
-    "schange20": "网站中继模式已禁用，你可在Settings.json文件中启用它",
+    "schange18": "网站中继模式已启用。 这意味着当对等方请求时，您的节点将帮助在网络中传输加密网站数据。 如想禁用此功能，您可以通过添加",
+    "schange19": "到",
+    "schange20": "网站中继模式已禁用，如想启用此功能，您可以通过添加",
     "schange21": "发布网站",
     "schange22": "尝试关注此注册名称时发生错误。 请再试一次!",
     "schange23": "尝试取消关注此注册名称时发生错误。 请再试一次!",

From ad87a2e8739e731944ff5154f753a8525384c8ed Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Fri, 15 Apr 2022 17:18:51 +0200
Subject: [PATCH 3/4] Fix translate

---
 .../core/trade-portal/trade-portal.src.js     | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
index ce6e0f7c..7e6c59aa 100644
--- a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
+++ b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
@@ -250,6 +250,14 @@ class TradePortal extends LitElement {
 			margin-bottom: 10px;
 		}
 
+		.tab-text {
+			color: var(--tradehave);
+			font-size: 12px;
+			text-align: left;
+			margin-top: 2px;
+			margin-bottom: -12px;
+		}
+
 		.historic-trades {
 			text-align: center;
 		}
@@ -529,6 +537,7 @@ class TradePortal extends LitElement {
 					<vaadin-grid multi-sort="true" theme="compact column-borders row-stripes wrap-cell-content" id="openOrdersGrid" aria-label="Open Orders" .items="${this.listedCoins.get(this.selectedCoin).openFilteredOrders}">
 						<vaadin-grid-column
 							auto-width
+							resizable
 							header="${translate("tradepage.tchange8")} (QORT)"
 							id="qortAmountColumn"
 							path="qortAmount"
@@ -587,11 +596,13 @@ class TradePortal extends LitElement {
 							<div style="margin-left: auto">
 								<mwc-icon-button class="btn-clear" title="${translate("tradepage.tchange15")}" icon="clear_all" @click="${() => this.clearBuyForm()}"></mwc-icon-button>
 							</div>
+                                                        <span class="tab-text">${translate("tradepage.tchange8")} (QORT)*</span>
 							<p>
 								<mwc-textfield
 									style="width: 100%; color: var(--black);"
 									id="buyAmountInput"
-									required readOnly label="${translate("tradepage.tchange8")} (QORT)"
+									required readOnly
+                                                                        label=""
 									placeholder="0.0000"
 									type="text" 
 									auto-validate="false"
@@ -599,12 +610,13 @@ class TradePortal extends LitElement {
 								>
 								</mwc-textfield>
 							</p>
+                                                        <span class="tab-text">${translate("tradepage.tchange14")} (${this.listedCoins.get(this.selectedCoin).coinCode})*</span>
 							<p>
 								<mwc-textfield
 									style="width: 100%; color: var(--black);"
 									id="buyPriceInput"
 									required readOnly
-									label="${translate("tradepage.tchange14")} (${this.listedCoins.get(this.selectedCoin).coinCode})"
+									label=""
 									placeholder="0.0000"
 									type="text"
 									auto-validate="false"
@@ -612,12 +624,13 @@ class TradePortal extends LitElement {
 								>
 								</mwc-textfield>
 							</p>
-							<p style="margin-bottom: 10px;">
+                                                        <span class="tab-text">${translate("tradepage.tchange10")} (${this.listedCoins.get(this.selectedCoin).coinCode})*</span>
+							<p>
 								<mwc-textfield
 									style="width: 100%; color: var(--black);"
 									id="buyTotalInput"
 									required readOnly
-									label="${translate("tradepage.tchange10")} (${this.listedCoins.get(this.selectedCoin).coinCode})"
+									label=""
 									placeholder="0.0000"
 									type="text"
 									auto-validate="false"
@@ -649,12 +662,14 @@ class TradePortal extends LitElement {
 						<div class="card">
 							<div style="margin-left: auto">
 								<mwc-icon-button class="btn-clear" title="${translate("tradepage.tchange15")}" icon="clear_all" @click="${() => this.clearSellForm()}"></mwc-icon-button>
-							</div>										
+							</div>
+							<span class="tab-text">${translate("tradepage.tchange8")} (QORT)*</span>
 							<p>
 								<mwc-textfield
 									style="width: 100%; color: var(--black);"
 									id="sellAmountInput"
-									required label="${translate("tradepage.tchange8")} (QORT)"
+									required
+                                                                        label=""
 									placeholder="0.0000"
 									@input="${(e) => { this._checkSellAmount(e) }}"
 									type="number"
@@ -663,11 +678,13 @@ class TradePortal extends LitElement {
 								>
 								</mwc-textfield>
 							</p>
+                                                        <span class="tab-text">${translate("tradepage.tchange14")} (${this.listedCoins.get(this.selectedCoin).coinCode})*</span>
 							<p>
 								<mwc-textfield
 									style="width: 100%; color: var(--black);"
 									id="sellPriceInput"
-									required label="${translate("tradepage.tchange14")} (${this.listedCoins.get(this.selectedCoin).coinCode})"
+									required
+                                                                        label=""
 									placeholder="0.0000"
 									@input="${(e) => { this._checkSellAmount(e) }}"
 									type="number"
@@ -676,12 +693,13 @@ class TradePortal extends LitElement {
 								>
 								</mwc-textfield>
 							</p>
-							<p style="margin-bottom: 10px;">
+                                                        <span class="tab-text">${translate("tradepage.tchange10")} (${this.listedCoins.get(this.selectedCoin).coinCode})*</span>
+							<p>
 								<mwc-textfield
 									style="width: 100%; color: var(--black);"
 									id="sellTotalInput"
 									required readOnly
-									label="${translate("tradepage.tchange10")} (${this.listedCoins.get(this.selectedCoin).coinCode})"
+									label=""
 									placeholder="0.0000"
 									type="number"
 									auto-validate="false"
@@ -1027,7 +1045,8 @@ class TradePortal extends LitElement {
         this.isLoadingOpenTrades = true
         this.createConnection()
         this._openOrdersGrid.querySelector('#priceColumn').headerRenderer = function (root) {
-            root.innerHTML = '<vaadin-grid-sorter path="price" direction="asc">Price (' + _this.listedCoins.get(_this.selectedCoin).coinCode + ')</vaadin-grid-sorter>'
+            const priceString2 = get("tradepage.tchange9")
+            root.innerHTML = '<vaadin-grid-sorter path="price" direction="asc">' + priceString2 + ' (' + _this.listedCoins.get(_this.selectedCoin).coinCode + ')</vaadin-grid-sorter>'
         }
         this.clearSellForm()
         this.clearBuyForm()

From d350a47b262d2b036c403c27d41780c98bf5cc81 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Fri, 15 Apr 2022 17:48:13 +0200
Subject: [PATCH 4/4] Fix Loading message

---
 .../plugins/core/trade-portal/trade-portal.src.js           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
index 7e6c59aa..2fda98e9 100644
--- a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
+++ b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
@@ -498,7 +498,7 @@ class TradePortal extends LitElement {
 			<div class="box">
 				<header><span>${translate("tradepage.tchange3")}</span></header>
 				<div class="border-wrapper">
-					<div class="loadingContainer" id="loadingHistoricTrades" style="display:${this.isLoadingHistoricTrades ? 'block' : 'none'}"><div class="loading"></div><span style="color: var(--black);">Loading...</span></div>
+					<div class="loadingContainer" id="loadingHistoricTrades" style="display:${this.isLoadingHistoricTrades ? 'block' : 'none'}"><div class="loading"></div><span style="color: var(--black);">${translate("login.loading")}</span></div>
 					<vaadin-grid theme="compact column-borders row-stripes wrap-cell-content" id="historicTradesGrid" aria-label="Historic Trades" .items="${this.listedCoins.get(this.selectedCoin).historicTrades}">
 						<vaadin-grid-column auto-width resizable header="${translate("tradepage.tchange8")} (QORT)" path="qortAmount"></vaadin-grid-column>
 						<vaadin-grid-column
@@ -533,7 +533,7 @@ class TradePortal extends LitElement {
 			<div class="box">
 				<header><span>${translate("tradepage.tchange5")}</span></header>
 				<div class="border-wrapper">
-					<div class="loadingContainer" id="loadingHistoricTrades" style="display:${this.isLoadingOpenTrades ? 'block' : 'none'}"><div class="loading"></div><span style="color: var(--black);">Loading...</span></div>
+					<div class="loadingContainer" id="loadingHistoricTrades" style="display:${this.isLoadingOpenTrades ? 'block' : 'none'}"><div class="loading"></div><span style="color: var(--black);">${translate("login.loading")}</span></div>
 					<vaadin-grid multi-sort="true" theme="compact column-borders row-stripes wrap-cell-content" id="openOrdersGrid" aria-label="Open Orders" .items="${this.listedCoins.get(this.selectedCoin).openFilteredOrders}">
 						<vaadin-grid-column
 							auto-width
@@ -729,7 +729,7 @@ class TradePortal extends LitElement {
 			<div class="box">
 				<header><span>${translate("tradepage.tchange6")}</span><mwc-icon-button title="${translate("tradepage.tchange7")}" icon="more_vert" @click=${() => this.showStuckOrdersDialog()}></mwc-icon-button></header>
 				<div class="border-wrapper">
-					<div class="loadingContainer" id="loadingHistoricTrades" style="display:${this.isLoadingMyOpenOrders ? 'block' : 'none'}"><div class="loading"></div><span style="color: var(--black);">Loading...</span></div>
+					<div class="loadingContainer" id="loadingHistoricTrades" style="display:${this.isLoadingMyOpenOrders ? 'block' : 'none'}"><div class="loading"></div><span style="color: var(--black);">${translate("login.loading")}</span></div>
 					<vaadin-grid multi-sort="true" theme="compact column-borders row-stripes wrap-cell-content" id="myOrdersGrid" aria-label="My Orders" .items="${this.listedCoins.get(this.selectedCoin).myOrders}">
 						<vaadin-grid-column
 							auto-width