i18n

src/i18n/zh/jo.json

@@ -513,6 +513,7 @@
   "Unable to get user ID": "無法獲取用戶ID",
   "Unassigned Job Orders": "未分配工單",
   "Unit": "單位",
+  "Assume Time Need": "預計所需時間",
   "Unknown": "未知",
   "Unknown error": "未知錯誤",
   "Unknown error: ": "未知錯誤: ",

src/i18n/zh/pickOrder.json

@@ -154,7 +154,29 @@
         "Enter isExtra workbench view?": "進入加單檢視？",
         "Etra view groups all add-on tickets by shop and lane for the selected date.": "加單檢視會依選定日期，將 isExtra 票依店鋪與車線顯示。",
         "Etra Ticket Notice": "目前是加單票，顯示與操作已切換為加單模式。",
-    
+        "Merge Etra ticket": "合併加單提料單",
+        "batch": "批量",
+        "single": "單量",
+        "isExtra": "加單",
+  "Merge Etra ticket dialog title": "合併加單提料單到批量或單量提料單",
+  "Merge Etra ticket lane hint": "只有未分配的提料單在同一店鋪、樓層（2/F、4/F 或車線-X）、車線和出發時間可以合併。左側：批量/單量或合併提料單。",
+  "Merge left column title": "批量 / 單量 / 合併提料單",
+  "Merge ticket TI-M": "TI-M merge ticket",
+  "Batch/Single ticket": "批量 / 單量提料單",
+  "Etra ticket": "加單提料單",
+  "No mergeable batch tickets": "沒有可合併的批量或單量提料單",
+  "No isExtra on same lane": "No isExtra tickets on the same lane",
+  "Select batch ticket first for isExtra": "先選擇批量或單量提料單",
+  "No delivery orders on ticket": "此提料單沒有送貨單",
+  "Merge Etra ticket confirm": "確認合併",
+  "Merge Etra ticket confirm title": "確認合併批量或單量提料單？",
+  "Merge Etra ticket confirm hint": "將會建立新的合併提料單；原批量或單量提料單將會被歸檔。",
+  "Merge Etra ticket confirm hint into TI-M": "加單提料單將會合併到選定的合併提料單；加單提料單將會被歸檔。",
+  "Merge Etra ticket success": "合併完成",
+  "Merge Etra ticket failed": "Merge failed",
+  "Merge Etra ticket search prompt": "請輸入商店編號搜索商店",
+  "Shop search": "商店搜索",
+  "Confirm Search": "確認搜索",
         "Pick Order": "提料單",
         "Type": "類型",
         "Product Type": "貨品類型",