tranlastion issue

src/i18n/zh/jo.json

@@ -11,7 +11,7 @@
   "Status": "來貨狀態",
   "Lot No.": "批號",
   "Bom": "物料清單",
-  "Release": "發佈",
+  "Release": "放單",
   "Pending": "待掃碼",
   "Pending for pick": "待提料",
   "Planning": "計劃中",
@@ -102,12 +102,6 @@
   "Issue Remark": "問題描述",
   "Received Qty": "接收數量",
   "Confirm Lot Substitution": "確認批號替換",
-<<<<<<< HEAD
   "Processing...": "處理中",
-"Processing...": "處理中",
-"Complete Job Order Record": "已完成工單記錄"
-
-=======
-  "Processing...": "處理中"
->>>>>>> 1d989c28c1973b644241c9a9586c42897979337e
+  "Complete Job Order Record": "已完成工單記錄"
 }

src/i18n/zh/pickOrder.json

@@ -284,7 +284,6 @@
     "completed DO pick orders":"已完成送貨單提料單",
     "No completed DO pick orders found":"沒有已完成送貨單提料單",
 
-    "Print DN Label":"列印送貨單標貼",
     "Enter the number of cartons: ": "請輸入總箱數",
     "Number of cartons": "箱數"