Merge remote-tracking branch 'origin/master' into nick

# Conflicts:
#	Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml

Merchant Token Vault Management/backstage/Resources/Views/Home/Index.zh.resx

@@ -121,21 +121,21 @@
     <value>匯入鑰匙</value>
   </data>
   <data name="Modify the number of Token Vault Entrys this month" xml:space="preserve">
-    <value>本月修改代碼化保險庫入口數量</value>
+    <value>本月修改代碼化資料數量</value>
   </data>
   <data name="Number of departments" xml:space="preserve">
     <value>部門數量</value>
   </data>
   <data name="Number of new Token Vault Entrys added this month" xml:space="preserve">
-    <value>本月新增代碼化保險庫入口數量</value>
+    <value>本月新增代碼化資料數量</value>
   </data>
   <data name="Number of Token Vaults" xml:space="preserve">
-    <value>Token Vault數量</value>
+    <value>代碼化保險庫數量</value>
   </data>
   <data name="Statistic" xml:space="preserve">
     <value>數據統計</value>
   </data>
   <data name="Total number of Token Vault Entrys" xml:space="preserve">
-    <value>代碼化保險庫入口總數量</value>
+    <value>代碼化資料總數量</value>
   </data>
 </root>
\ No newline at end of file

Merchant Token Vault Management/backstage/Resources/Views/Key/ListKeys.zh.resx

@@ -156,7 +156,7 @@
   <data name="Create Department" xml:space="preserve">
     <value>新增部門</value>
   </data>
-  <data name="Create key" xml:space="preserve">
+  <data name="Create Key" xml:space="preserve">
     <value>新增鑰匙</value>
   </data>
   <data name="Creation Date" xml:space="preserve">
@@ -174,13 +174,13 @@
   <data name="Delete" xml:space="preserve">
     <value>刪除</value>
   </data>
-  <data name="Delete key" xml:space="preserve">
+  <data name="Delete Key" xml:space="preserve">
     <value>刪除鑰匙</value>
   </data>
   <data name="Description" xml:space="preserve">
     <value>描述</value>
   </data>
-  <data name="Edit key" xml:space="preserve">
+  <data name="Edit Key" xml:space="preserve">
     <value>編輯鑰匙</value>
   </data>
   <data name="Enable" xml:space="preserve">
@@ -201,6 +201,9 @@
   <data name="ID" xml:space="preserve">
     <value>編號</value>
   </data>
+  <data name="Import Key" xml:space="preserve">
+    <value>匯入鑰匙</value>
+  </data>
   <data name="Inactive" xml:space="preserve">
     <value>未啟用</value>
   </data>
@@ -249,9 +252,6 @@
   <data name="Select user" xml:space="preserve">
     <value>新增用戶</value>
   </data>
-  <data name="Send out" xml:space="preserve">
-    <value>送出</value>
-  </data>
   <data name="Serial number" xml:space="preserve">
     <value>編號</value>
   </data>
@@ -264,6 +264,9 @@
   <data name="Status" xml:space="preserve">
     <value>狀態</value>
   </data>
+  <data name="Submit" xml:space="preserve">
+    <value>送出</value>
+  </data>
   <data name="Token Vault List" xml:space="preserve">
     <value>代碼化保險庫列管理</value>
   </data>

Merchant Token Vault Management/backstage/Resources/Views/Shared/_layout.zh.resx

@@ -136,7 +136,7 @@
     <value>設定備份</value>
   </data>
   <data name="Token Vaults" xml:space="preserve">
-    <value>Token Vault管理</value>
+    <value>代碼化保險庫管理</value>
   </data>
   <data name="User List" xml:space="preserve">
     <value>使用者列表</value>
@@ -145,7 +145,7 @@
     <value>使用者管理</value>
   </data>
   <data name="Vault Backup" xml:space="preserve">
-    <value>Vault備份</value>
+    <value>保險庫備份</value>
   </data>
   <data name="version" xml:space="preserve">
     <value>版本</value>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/CreateTokenVault.zh.resx

@@ -123,7 +123,7 @@
   <data name="Back to List" xml:space="preserve">
     <value>返回列表</value>
   </data>
-  <data name="Basic" xml:space="preserve">
+  <data name="Basic Info" xml:space="preserve">
     <value>基本資料</value>
   </data>
   <data name="Choose department" xml:space="preserve">
@@ -150,15 +150,15 @@
   <data name="Number of users" xml:space="preserve">
     <value>使用者數量</value>
   </data>
-  <data name="Send out" xml:space="preserve">
-    <value>送出</value>
-  </data>
   <data name="Serial number" xml:space="preserve">
     <value>編號</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>狀態</value>
   </data>
+  <data name="Submit" xml:space="preserve">
+    <value>送出</value>
+  </data>
   <data name="Token Vault List" xml:space="preserve">
     <value>代碼化保險庫列表管理</value>
   </data>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListFields.zh.resx

@@ -120,6 +120,9 @@
   <data name="Add Field" xml:space="preserve">
     <value>新增欄位</value>
   </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>取消</value>
+  </data>
   <data name="Choose department" xml:space="preserve">
     <value>選擇部門</value>
   </data>
@@ -174,6 +177,9 @@
   <data name="Status" xml:space="preserve">
     <value>狀態</value>
   </data>
+  <data name="Submit" xml:space="preserve">
+    <value>送出</value>
+  </data>
   <data name="Token Vault List" xml:space="preserve">
     <value>代碼化保險庫列表管理</value>
   </data>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListMasks.zh.resx

@@ -120,7 +120,7 @@
   <data name="Add Field" xml:space="preserve">
     <value>新增欄位</value>
   </data>
-  <data name="Add mask" xml:space="preserve">
+  <data name="Add Mask" xml:space="preserve">
     <value>新增遮罩</value>
   </data>
   <data name="Add User" xml:space="preserve">
@@ -159,7 +159,7 @@
   <data name="Data Mask" xml:space="preserve">
     <value>遮罩</value>
   </data>
-  <data name="Data mask list" xml:space="preserve">
+  <data name="Data Mask List" xml:space="preserve">
     <value>資料遮罩列表</value>
   </data>
   <data name="Data Token Vault" xml:space="preserve">

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListUsers.zh.resx

@@ -123,25 +123,25 @@
   <data name="Add User" xml:space="preserve">
     <value>新增使用者</value>
   </data>
-  <data name="Allow decrypt" xml:space="preserve">
-    <value>允許解密</value>
-  </data>
   <data name="Allow decryption" xml:space="preserve">
     <value>允許解密</value>
   </data>
-  <data name="Allow delete" xml:space="preserve">
-    <value>允許刪除</value>
-  </data>
-  <data name="Allow mask" xml:space="preserve">
-    <value>遮罩權限</value>
-  </data>
   <data name="Allow new" xml:space="preserve">
     <value>允許新增</value>
   </data>
-  <data name="Allow to add" xml:space="preserve">
+  <data name="Allow to Add" xml:space="preserve">
     <value>允許新增</value>
   </data>
-  <data name="Allow update" xml:space="preserve">
+  <data name="Allow to decrypt" xml:space="preserve">
+    <value>允許解密</value>
+  </data>
+  <data name="Allow to Delete" xml:space="preserve">
+    <value>允許刪除</value>
+  </data>
+  <data name="Allow to Mask" xml:space="preserve">
+    <value>遮罩權限</value>
+  </data>
+  <data name="Allow to Update" xml:space="preserve">
     <value>允許更新</value>
   </data>
   <data name="Are you sure you want to remove this user?" xml:space="preserve">
@@ -168,7 +168,7 @@
   <data name="Data Token Vault" xml:space="preserve">
     <value>資料代碼保險庫</value>
   </data>
-  <data name="Default mask" xml:space="preserve">
+  <data name="Default Mask" xml:space="preserve">
     <value>預設遮罩</value>
   </data>
   <data name="Default Mask ID" xml:space="preserve">
@@ -180,7 +180,7 @@
   <data name="Description" xml:space="preserve">
     <value>描述</value>
   </data>
-  <data name="Edit user" xml:space="preserve">
+  <data name="Edit User" xml:space="preserve">
     <value>編輯使用者</value>
   </data>
   <data name="Enable" xml:space="preserve">
@@ -207,10 +207,10 @@
   <data name="No" xml:space="preserve">
     <value>否</value>
   </data>
-  <data name="Number of codes" xml:space="preserve">
+  <data name="Number of Codes" xml:space="preserve">
     <value>代碼數量</value>
   </data>
-  <data name="Number of users" xml:space="preserve">
+  <data name="Number of Users" xml:space="preserve">
     <value>使用者數量</value>
   </data>
   <data name="Please select default mask(Single option)." xml:space="preserve">
@@ -222,7 +222,7 @@
   <data name="Please select user(Single option)." xml:space="preserve">
     <value>請選使用者名稱(單選)</value>
   </data>
-  <data name="Remove user" xml:space="preserve">
+  <data name="Remove User" xml:space="preserve">
     <value>移除使用者</value>
   </data>
   <data name="Revise" xml:space="preserve">
@@ -231,9 +231,6 @@
   <data name="Select user" xml:space="preserve">
     <value>新增用戶</value>
   </data>
-  <data name="Send out" xml:space="preserve">
-    <value>送出</value>
-  </data>
   <data name="Serial number" xml:space="preserve">
     <value>編號</value>
   </data>
@@ -243,6 +240,9 @@
   <data name="Status" xml:space="preserve">
     <value>狀態</value>
   </data>
+  <data name="Submit" xml:space="preserve">
+    <value>送出</value>
+  </data>
   <data name="Token Vault List" xml:space="preserve">
     <value>代碼化保險庫列表管理</value>
   </data>

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/Permission.zh.resx

@@ -129,7 +129,7 @@
   <data name="Create date" xml:space="preserve">
     <value>建立日</value>
   </data>
-  <data name="Create user permission" xml:space="preserve">
+  <data name="Create User Permission" xml:space="preserve">
     <value>新增使用者及權限</value>
   </data>
   <data name="Creation Date" xml:space="preserve">
@@ -190,7 +190,7 @@
     <value>代碼庫</value>
   </data>
   <data name="Token Vault List" xml:space="preserve">
-    <value>代碼化保險庫列管理</value>
+    <value>代碼化保險庫列表管理</value>
   </data>
   <data name="Tpye" xml:space="preserve">
     <value>種類</value>

Merchant Token Vault Management/backstage/Resources/Views/User/ChangePassword.zh.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Account Information" xml:space="preserve">
-    <value>帳戶信息</value>
+    <value>帳戶資訊</value>
   </data>
   <data name="Cancel" xml:space="preserve">
     <value>取消</value>
@@ -129,19 +129,19 @@
   <data name="Confirm" xml:space="preserve">
     <value>確認</value>
   </data>
-  <data name="Current passwrod" xml:space="preserve">
+  <data name="Current Passwrod" xml:space="preserve">
     <value>目前密碼</value>
   </data>
-  <data name="name" xml:space="preserve">
+  <data name="Name" xml:space="preserve">
     <value>名稱</value>
   </data>
-  <data name="New password" xml:space="preserve">
+  <data name="New Password" xml:space="preserve">
     <value>新密碼</value>
   </data>
   <data name="Submit" xml:space="preserve">
     <value>送出</value>
   </data>
-  <data name="username" xml:space="preserve">
+  <data name="Username" xml:space="preserve">
     <value>使用者名稱</value>
   </data>
 </root>
\ No newline at end of file

Merchant Token Vault Management/backstage/Resources/Views/User/CreateDepartment.zh.resx

@@ -117,10 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Back to list" xml:space="preserve">
+  <data name="Back to List" xml:space="preserve">
     <value>返回列表</value>
   </data>
-  <data name="Basic" xml:space="preserve">
+  <data name="Basic Info" xml:space="preserve">
     <value>基本資料</value>
   </data>
   <data name="Create Department" xml:space="preserve">

Merchant Token Vault Management/backstage/Resources/Views/User/CreateUser.zh.resx

@@ -117,28 +117,28 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Back to list" xml:space="preserve">
+  <data name="Back to List" xml:space="preserve">
     <value>返回列表</value>
   </data>
-  <data name="Basic" xml:space="preserve">
+  <data name="Basic Info" xml:space="preserve">
     <value>基本資料</value>
   </data>
   <data name="Create User" xml:space="preserve">
     <value>新增使用者</value>
   </data>
-  <data name="email" xml:space="preserve">
+  <data name="Email" xml:space="preserve">
     <value>電子郵件</value>
   </data>
-  <data name="name" xml:space="preserve">
+  <data name="Name" xml:space="preserve">
     <value>名稱</value>
   </data>
-  <data name="password" xml:space="preserve">
+  <data name="Password" xml:space="preserve">
     <value>密碼</value>
   </data>
   <data name="Submit" xml:space="preserve">
     <value>送出</value>
   </data>
-  <data name="username" xml:space="preserve">
+  <data name="Username" xml:space="preserve">
     <value>使用者名稱</value>
   </data>
 </root>
\ No newline at end of file

Merchant Token Vault Management/backstage/Resources/Views/User/ListDepartments.zh.resx

@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Back to list" xml:space="preserve">
+  <data name="Back to List" xml:space="preserve">
     <value>返回列表</value>
   </data>
   <data name="Create Department" xml:space="preserve">

Merchant Token Vault Management/backstage/Resources/Views/User/ListUsers.zh.resx

@@ -121,36 +121,39 @@
     <value>管理員</value>
   </data>
   <data name="Admin count" xml:space="preserve">
-    <value>Admin數量</value>
+    <value>管理員數量</value>
   </data>
   <data name="Create User" xml:space="preserve">
     <value>新增使用者</value>
   </data>
-  <data name="creation_date" xml:space="preserve">
+  <data name="Creation Date" xml:space="preserve">
     <value>建立日期</value>
   </data>
   <data name="Email" xml:space="preserve">
     <value>電子信箱</value>
   </data>
-  <data name="enabled" xml:space="preserve">
+  <data name="Enabled" xml:space="preserve">
     <value>啟用</value>
   </data>
   <data name="Failed" xml:space="preserve">
     <value>錯誤</value>
   </data>
-  <data name="name" xml:space="preserve">
+  <data name="Name" xml:space="preserve">
     <value>名稱</value>
   </data>
   <data name="Success" xml:space="preserve">
     <value>成功</value>
   </data>
+  <data name="Uer ID" xml:space="preserve">
+    <value>使用者ID</value>
+  </data>
   <data name="User count" xml:space="preserve">
     <value>使用者數量</value>
   </data>
   <data name="User List" xml:space="preserve">
     <value>使用者列表</value>
   </data>
-  <data name="username" xml:space="preserve">
+  <data name="Username" xml:space="preserve">
     <value>使用者名稱</value>
   </data>
 </root>
\ No newline at end of file

Merchant Token Vault Management/backstage/Views/Home/Index.cshtml

@@ -45,7 +45,7 @@
 	<div class="col-lg-4 col-md-6 grid-margin stretch-card dashboard-card">
 		<div class="card">
 			<div class="card-body">
-				<h4 class="card-title">Token Vault Entry <br>@Localizer["Total number of Token Vault Entrys"]</h4>
+				<h4 class="card-title">@*Token Vault Entry <br>*@@Localizer["Total number of Token Vault Entrys"]</h4>
 				<div class="card-content text-center">
 					<img src="~/images/admin-vault-data.svg" class="img-fuild">
 					<p class="number text-center">@ViewBag.totalEntry</p>

Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml

@@ -56,7 +56,7 @@
 					</div>
 				</div>
 				<div class="newBlock">
-					<button type="button" class="btn btn-info btn-mainblue-solid0 float-right disabledClass mb-3" data-toggle="modal" data-target="#newApp">@*<img src="~/images/memberGo/apiKey/newapp-w-300ppi.png">*@@Localizer["Create key"]</button>
+					<button type="button" class="btn btn-info btn-mainblue-solid0 float-right disabledClass mb-3" data-toggle="modal" data-target="#newApp">@*<img src="~/images/memberGo/apiKey/newapp-w-300ppi.png">*@@Localizer["Create Key"]</button>
 
 					<div class="table-responsive">
 						<!--交易紀錄列表 table-->
@@ -134,7 +134,7 @@
 						-->
 						<h3 class="modal-title">
 							@*<img src="~/images/memberGo/apiKey/newapp-orange-300ppi.png">*@
-							@Localizer["Create key"]
+							@Localizer["Create Key"]
 						</h3>
 					</div> <!--END of div "modal-header"-->
 					<div class="modal-body" style="padding-top:35px">
@@ -206,7 +206,7 @@
 							</div> -->
 							<!--</div>-->  <!-- End of iOS Adv-->
 							<div class="SubmitBlock">
-								<button id="CreateKey" type="button" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Send out"]</button>
+								<button id="CreateKey" type="button" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Submit"]</button>
 								<button type="button" class="btn btn-mainblue-hollow btnReset0" data-dismiss="modal">@Localizer["Cancel"]</button>
 							</div>
 						</form>
@@ -269,7 +269,7 @@
 
 
 							<div class="SubmitBlock">
-								<button id="edit_key_submit" type="button" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Send out"]</button>
+							<button id="edit_key_submit" type="button" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Submit"]</button>
 								<button type="button" class="btn btn-mainblue-hollow btnReset0" data-dismiss="modal">@Localizer["Cancel"]</button>
 							</div>
 						</form>
@@ -292,7 +292,7 @@
 
 					<div class="modal-header">
 						<h4>
-							@Localizer["Delete key"]
+							@Localizer["Delete Key"]
 						</h4>
 					</div> <!--END of div "modal-header"-->
 

Merchant Token Vault Management/backstage/Views/TokenVault/CreateTokenVault.cshtml

@@ -25,7 +25,7 @@
 
 				<form class="forms-sample" method="post" asp-action="CreateTokenVault" autocomplete="off">
 					<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
-					<p class="form-title card-description">@Localizer["Basic"]</p>
+					<p class="form-title card-description">@Localizer["Basic Info"]</p>
 					<div class="row">
 						<div class="col-md-6 form-group required">
 
@@ -55,7 +55,7 @@
 
 
 
-					<button type="submit" class="btn btn-primary mr-2">@Localizer["Send out"]</button>
+					<button type="submit" class="btn btn-primary mr-2">@Localizer["Submit"]</button>
 					<a type="button" class="btn btn-light" asp-action="List">@Localizer["Back to List"]</a>
 				</form>
 			</div>

Merchant Token Vault Management/backstage/Views/TokenVault/ListMasks.cshtml

@@ -71,14 +71,14 @@
 				</table>
 				<div class="newBlock">
 					@*<button type="button" class="btn btn-mainblue-hollow" onclick="window.location.href='tokenVault_fields.html'"><img src="images/memberGo/apiKey/back_o_icons8-undo-90.png">返回</button>*@
-					<button id="NewMaskBtn" type="button" class="btn btn-info btn-mainblue-solid0 btn-sm0 @disabledClass" data-toggle="modal" data-target="#new-field-mask">@*<img src="~/images/memberGo/add.png">*@@Localizer["Add mask"]</button>
+					<button id="NewMaskBtn" type="button" class="btn btn-info btn-mainblue-solid0 btn-sm0 @disabledClass" data-toggle="modal" data-target="#new-field-mask">@*<img src="~/images/memberGo/add.png">*@@Localizer["Add Mask"]</button>
 				</div>
 
 				<div class="table-responsive">
 					<table class="table table-striped table-hover0 table-bordered" id="memberGoTbl_masksList">
 						<thead>
 							<tr>
-								<th colspan="9">@Localizer["Data mask list"]</th>
+								<th colspan="9">@Localizer["Data Mask List"]</th>
 							</tr>
 						</thead>
 						<tbody>

Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml

@@ -57,10 +57,10 @@
 										<th>@Localizer["Name"]</th>
 										<th>@Localizer["Username"]</th>
 										<th>@Localizer["Mask"]</th>
-										<th>@Localizer["Allow decryption"]</th>
-										<th>@Localizer["Allow to add"]</th>
-										<th>@Localizer["Allow update"]</th>
-										<th>@Localizer["Allow delete"]</th>
+										<th>@Localizer["Allow to Decrypt"]</th>
+										<th>@Localizer["Allow to Add"]</th>
+										<th>@Localizer["Allow to Update"]</th>
+										<th>@Localizer["Allow to Delete"]</th>
 										<th>@Localizer["Default Mask ID"]</th>
 										<th>@Localizer["Manage"]</th>
 									</tr>
@@ -123,7 +123,7 @@
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<h5 class="modal-title" id="myModalLabel">@Localizer["Select user"]</h5>
+				<h5 class="modal-title" id="myModalLabel">@Localizer["Select User"]</h5>
 				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
 					<span aria-hidden="true">&times;</span>
 				</button>
@@ -188,7 +188,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="mask">@Localizer["Allow mask"]：</label>
+						<label class="control-labe" for="mask">@Localizer["Allow to Mask"]：</label>
 						<div class="form-group">
 							<div class="dropdown bootstrap-select show-tick selecter form-control ">
 								<select name="allow_masks" id="select_mask" multiple="" title="@Localizer["Please select mask(multiple options)."]" class="mask_selectpicker selectpicker selecter form-control selectpicker-tokenization" tabindex="null" asp-items="ViewBag.masks">
@@ -199,7 +199,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="mask">@Localizer["Default mask"]：</label>
+						<label class="control-labe" for="mask">@Localizer["Default Mask"]：</label>
 						<div class="form-group">
 							<div class="dropdown bootstrap-select selecter form-control ">
 								<select name="default_mask_id" id="default_mask" title="@Localizer["Please select default mask(Single option)."]" class=" default_mask_selectpicker selectpicker selecter form-control selectpicker-tokenization" tabindex="null" asp-items="ViewBag.masks">
@@ -210,7 +210,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow decrypt"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Decrypt"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_decrypt" id="allowDecodeY" value="1" checked>
 							<label class="form-check-label" for="allowDecodeY">
@@ -226,7 +226,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow new"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Add"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_new" id="allowAddY" value="1" checked>
 							<label class="form-check-label" for="allowAddY">
@@ -242,7 +242,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow update"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Update"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_update" id="allowUpdateY" value="1" checked>
 							<label class="form-check-label" for="allowUpdateY">
@@ -258,7 +258,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow delete"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Delete"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_del" id="allowDeleteY" value="1" checked>
 							<label class="form-check-label" for="allowDeleteY">
@@ -274,7 +274,7 @@
 					</div>
 
 					<div class="SubmitBlock">
-						<button id="createUserBtn" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Send out"]</button>
+						<button id="createUserBtn" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Submit"]</button>
 						<button type="button" class="btn btn-mainblue-hollow btnReset0" data-dismiss="modal">@Localizer["Cancel"]</button>
 					</div>
 				</form>
@@ -303,7 +303,7 @@
 				<button type="button" class="close" data-dismiss="modal">&times;</button>
 				-->
 				<!--<h3 class="modal-title">
-					@Localizer["Edit user"]
+					@Localizer["Edit User"]
 				</h3>
 
 			</div>--> <!--END of div "modal-header"-->
@@ -339,7 +339,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="mask">@Localizer["Allow mask"]：</label>
+						<label class="control-labe" for="mask">@Localizer["Allow to Mask"]：</label>
 						<div class="form-group">
 							<div class="dropdown bootstrap-select show-tick selecter form-control ">
 								<select name="allow_masks" id="edit_select_mask" multiple="" title="@Localizer["Please select mask(multiple options)."]" class="mask_selectpicker selectpicker selecter form-control selectpicker-tokenization" tabindex="null" asp-items="ViewBag.masks">
@@ -349,7 +349,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="mask">@Localizer["Default mask"]：</label>
+						<label class="control-labe" for="mask">@Localizer["Default Mask"]：</label>
 						<div class="form-group">
 							<div class="dropdown bootstrap-select selecter form-control ">
 								<select name="default_mask_id" id="edit_default_mask" title="@Localizer["Please select default mask(Single option)."]" class=" default_mask_selectpicker selectpicker selecter form-control selectpicker-tokenization" tabindex="null" asp-items="ViewBag.masks">
@@ -359,7 +359,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow decrypt"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Decrypt"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_decrypt" id="allowDecodeY" value="1" checked>
 							<label class="form-check-label" for="allowDecodeY">
@@ -375,7 +375,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow new"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Add"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_new" id="allowAddY" value="1" checked>
 							<label class="form-check-label" for="allowAddY">
@@ -391,7 +391,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow update"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Update"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_update" id="allowUpdateY" value="1" checked>
 							<label class="form-check-label" for="allowUpdateY">
@@ -407,7 +407,7 @@
 					</div>
 
 					<div class="form-group">
-						<label class="control-labe" for="">@Localizer["Allow delete"]：</label>
+						<label class="control-labe" for="">@Localizer["Allow to Delete"]：</label>
 						<div class="form-check form-check-inline">
 							<input class="form-check-input" type="radio" name="allow_del" id="allowDeleteY" value="1" checked>
 							<label class="form-check-label" for="allowDeleteY">
@@ -423,7 +423,7 @@
 					</div>
 
 					<div class="SubmitBlock">
-						<button id="createUserBtn" class="btn btn-mainblue-solid btnSubmit">@Localizer["Send out"]</button>
+						<button id="createUserBtn" class="btn btn-mainblue-solid btnSubmit">@Localizer["Submit"]</button>
 						<button type="button" class="btn btn-mainblue-hollow btnReset" data-dismiss="modal">@Localizer["Cancel"]</button>
 					</div>
 				</form>
@@ -450,7 +450,7 @@
 
 			<div class="modal-header">
 				<h4>
-					@Localizer["Remove user"]
+					@Localizer["Remove User"]
 				</h4>
 			</div> <!--END of div "modal-header"-->
 

Merchant Token Vault Management/backstage/Views/TokenVault/Permission.cshtml

@@ -66,7 +66,7 @@
 							</div>
 						</div>
 						<div class="newBlock newPerm" style="float: right;">
-							<button type="button" class="btn btn-info btn-mainblue-solid0  btn-sm0" data-toggle="collapse" data-target="#newPermission">@*<img src="~/images/memberGo/permission/userRights-4-white-100.png">*@@Localizer["Create user permission"]</button>
+							<button type="button" class="btn btn-info btn-mainblue-solid0  btn-sm0" data-toggle="collapse" data-target="#newPermission">@*<img src="~/images/memberGo/permission/userRights-4-white-100.png">*@@Localizer["Create User Permission"]</button>
 						</div> <!--end fo newBlock-->
 
 					</div>

Merchant Token Vault Management/backstage/Views/User/ChangePassword.cshtml

@@ -37,11 +37,11 @@
 							<input asp-for="uid" type="text" class="form-control" disabled>
 						</div>
 						<div class="col-md-4 form-group required">
-							<label asp-for="name" class="col-form-label" for="">@Localizer["name"]</label>
+							<label asp-for="name" class="col-form-label" for="">@Localizer["Name"]</label>
 							<input asp-for="name" type="text" class="form-control" disabled>
 						</div>
 						<div class="col-md-4 form-group required">
-							<label asp-for="username" class="col-form-label" for="">@Localizer["username"]</label>
+							<label asp-for="username" class="col-form-label" for="">@Localizer["Username"]</label>
 							<input asp-for="username" type="text" class="form-control" disabled>
 						</div>
 					</div>
@@ -52,14 +52,14 @@
 
 
 						<div class="col-md-4 form-group required">
-							<label asp-for="password" class="col-form-label" for="">@Localizer["Current passwrod"]</label>
+							<label asp-for="password" class="col-form-label" for="">@Localizer["Current Passwrod"]</label>
 							<input asp-for="password" type="password" class="form-control">
 						</div>
 					</div>
 
 					<div class="row">
 						<div class="col-md-4 form-group required">
-							<label asp-for="newPassword" class="col-form-label">@Localizer["New password"]</label>
+							<label asp-for="newPassword" class="col-form-label">@Localizer["New Password"]</label>
 							<input asp-for="newPassword" type="password" class="form-control" id="newPWD">
 						</div>
 					</div>

Merchant Token Vault Management/backstage/Views/User/CreateDepartment.cshtml

@@ -25,7 +25,7 @@
 
 				<form class="forms-sample" method="post" asp-action="CreateDepartment" autocomplete="off">
 					<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
-					<p class="form-title card-description">@Localizer["Basic"]</p>
+					<p class="form-title card-description">@Localizer["Basic Info"]</p>
 					<div class="row">
 						<div class="col-md-4 form-group required">
 							<label asp-for="name" class="col-form-label" for="">@Localizer["Name"]</label>
@@ -44,7 +44,7 @@
 
 
 					<button type="submit" class="btn btn-primary mr-2">@Localizer["Submit"]</button>
-					<a type="button" class="btn btn-light" asp-action="ListDepartments">@Localizer["Back to list"]</a>
+					<a type="button" class="btn btn-light" asp-action="ListDepartments">@Localizer["Back to List"]</a>
 				</form>
 			</div>
 		</div>

Merchant Token Vault Management/backstage/Views/User/CreateUser.cshtml

@@ -25,15 +25,15 @@
 
 				<form class="forms-sample" method="post" asp-action="CreateUser" autocomplete="off">
 					<div id="errorMsg" asp-validation-summary="All" class="text-danger"></div>
-					<p class="form-title card-description">@Localizer["Basic"]</p>
+					<p class="form-title card-description">@Localizer["Basic Info"]</p>
 					<div class="row">
 						<div class="col-md-4 form-group required">
-							<label asp-for="name" class="col-form-label" for="">@Localizer["name"]</label>
+							<label asp-for="name" class="col-form-label" for="">@Localizer["Name"]</label>
 							<input asp-for="name" type="text" class="form-control" id="">
 							<span asp-validation-for="name" class="text-danger"></span>
 						</div>
 						<div class="col-md-4 form-group required">
-							<label asp-for="username" class="col-form-label" for="username">@Localizer["username"]</label>
+							<label asp-for="username" class="col-form-label" for="username">@Localizer["Username"]</label>
 							<input asp-for="username" class="form-control" id="username">
 							<span asp-validation-for="username" class="text-danger"></span>
 						</div>
@@ -42,7 +42,7 @@
 
 					<div class="row">
 						<div class="col-md-6 form-group">
-							<label asp-for="email" class="col-form-label" for="email">@Localizer["email"]</label>
+							<label asp-for="email" class="col-form-label" for="email">@Localizer["Email"]</label>
 							<input asp-for="email" class="form-control" id="email">
 							<span asp-validation-for="email" class="text-danger"></span>
 						</div>
@@ -50,7 +50,7 @@
 					</div>
 					<div class="row">
 						<div class="col-md-4 form-group required">
-							<label asp-for="password" class="col-form-label" for="">@Localizer["password"]</label>
+							<label asp-for="password" class="col-form-label" for="">@Localizer["Password"]</label>
 							<input asp-for="password" type="text" class="form-control" id="">
 							<span asp-validation-for="password" class="text-danger"></span>
 						</div>
@@ -63,7 +63,7 @@
 
 
 					<button type="submit" class="btn btn-primary mr-2">@Localizer["Submit"]</button>
-					<a type="button" class="btn btn-light" asp-action="ListUsers">@Localizer["Back to list"]</a>
+					<a type="button" class="btn btn-light" asp-action="ListUsers">@Localizer["Back to List"]</a>
 				</form>
 			</div>
 		</div>

Merchant Token Vault Management/backstage/Views/User/ListUsers.cshtml

@@ -37,14 +37,14 @@
 					<table class="table table-striped" style="display: none;">
 						<thead>
 							<tr>
-								<th>uid</th>
-								<th>@Localizer["name"]</th>
+								<th>@Localizer["User ID"]</th>
+								<th>@Localizer["Name"]</th>
 								@*<th>name_en</th>*@
-								<th>@Localizer["username"]</th>
+								<th>@Localizer["Username"]</th>
 								<th>@Localizer["Email"]</th>
 								@*<th>locked</th>*@
-								<th>@Localizer["creation_date"]</th>
-								<th>@Localizer["enabled"]</th>
+								<th>@Localizer["Creation Date"]</th>
+								<th>@Localizer["Enabled"]</th>
 								<th>@Localizer["Admin"]</th>
 								@*<th>birthdate</th>
 									<th>marital_status</th>

Merchant Token Vault Management/backstage/wwwroot/css/tokenizationPlatform.css

@@ -69,7 +69,8 @@ img {
 }
 
 .show {
-	display: block !important;
+	/*display: block !important;*/
+	display: block;
 }
 
 /*當table裡的dropdpnw menu點開之後超過table的高度時,table高度自動增加
@@ -4050,6 +4051,9 @@ TBL_keysList tbody td {
 	line-height: 1.5 !important;
 }
 
+#adminStatus {
+	margin-bottom: 10px;
+}