From f48839e9bf2d22ba2ad3b8c8a0384953eba23057 Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Fri, 10 Oct 2025 10:30:56 +0800
Subject: [PATCH] quick translation update

---
 src/i18n/zh/dashboard.json | 4 ----
 src/i18n/zh/pickOrder.json | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/i18n/zh/dashboard.json b/src/i18n/zh/dashboard.json
index a75a248..ec1b5e4 100644
--- a/src/i18n/zh/dashboard.json
+++ b/src/i18n/zh/dashboard.json
@@ -56,9 +56,5 @@
   "No": "無",
   "Responsible Escalation List": "負責的上報列表",
   "show completed logs": "顯示已完成上報",
-<<<<<<< Updated upstream
-   "Rows per page": "每頁行數"
-=======
   "Rows per page": "每頁行數"
->>>>>>> Stashed changes
 }
diff --git a/src/i18n/zh/pickOrder.json b/src/i18n/zh/pickOrder.json
index e6a81b1..c5dd822 100644
--- a/src/i18n/zh/pickOrder.json
+++ b/src/i18n/zh/pickOrder.json
@@ -257,7 +257,7 @@
         "Pick Execution Detail":"進行提料詳情",
         "Submit Required Pick Qty":"提交所需提料數量",
         "Scan Result":"掃描結果",
-        "Ticket No.":"提單號碼",
+        "Ticket No.":"提票號碼",
         "Start QR Scan":"開始QR掃描",
         "Stop QR Scan":"停止QR掃描",
         "Scanning...":"掃描中...",