commit TokenVault/List.zh.resx

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

@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+<<<<<<< Updated upstream
+=======
+  <data name="Backup" xml:space="preserve">
+    <value>備份</value>
+  </data>
+>>>>>>> Stashed changes
   <data name="Cancel" xml:space="preserve">
     <value>取消</value>
   </data>
@@ -150,6 +156,9 @@
   <data name="Description" xml:space="preserve">
     <value>描述</value>
   </data>
+  <data name="Download" xml:space="preserve">
+    <value>下載</value>
+  </data>
   <data name="ID" xml:space="preserve">
     <value>編號</value>
   </data>
@@ -168,8 +177,13 @@
   <data name="Number of users" xml:space="preserve">
     <value>使用者數量</value>
   </data>
+<<<<<<< Updated upstream
   <data name="Please confirm to delete vault." xml:space="preserve">
     <value>儲存庫刪除確認</value>
+=======
+  <data name="Restore" xml:space="preserve">
+    <value>還原</value>
+>>>>>>> Stashed changes
   </data>
   <data name="Serial number" xml:space="preserve">
     <value>編號</value>

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

@@ -109,14 +109,14 @@
 		<div class="modal-content">
 
 			<div class="modal-header">
-				<h3 class="modal-title">Backup</h3>
+				<h3 class="modal-title">@Localizer["Backup"]</h3>
 			</div> 
 
 			<div class="modal-body" style="padding-top:35px; padding-bottom: 35px">
 				<p class="modal-body-title">下載備份檔到本機</p>
 				<p>下載備份檔到本機</p>
 				<div class="SubmitBlock SubmitBlock_sm">
-					<button type="button" id="backupConfirm" class="btn btn-mainblue-solid" data-dismiss="modal" style="">@Localizer["Confirm"]</button>
+					<button type="button" id="backupConfirm" class="btn btn-mainblue-solid" data-dismiss="modal" style="">@Localizer["Download"]</button>
 					<button type="button" class="btn btn-mainblue-hollow" data-dismiss="modal" style="">@Localizer["Cancel"]</button>
 				</div>
 			</div>
@@ -135,7 +135,7 @@
 		<div class="modal-content">
 
 			<div class="modal-header">
-				<h3 class="modal-title">Restitute</h3>
+				<h3 class="modal-title">@Localizer["Restore"]</h3>
 			</div>
 
 			<div class="modal-body" style="padding-top:35px; padding-bottom: 35px">