Merge branch 'master' of http://119.91.43.128:3001/sheng/mes-ui-d2

src/locales/en.json

@@ -1179,6 +1179,35 @@
 					"enter_semi_finished_id": "Enter semi-finished ID",
 					"start_time": "Start Time",
 					"end_time": "End Time"
+				},
+				"rework_management": {
+					"active": "Activated",
+					"not_activated": "Inactive",
+					"reset": "Reset",
+					"battery_id": "Battery Barcode",
+					"enter_battery_id": "Enter battery barcode",
+					"verify_data": "Verify Data",
+					"input_rule": "Rule: One barcode per line",
+					"re_activate": "Re-activate",
+					"multi_battery_input": "Multi-Battery Input",
+					"confirm": "Confirm",
+					"cancel": "Cancel",
+					"enter_battery_id_before_action": "Enter battery barcode first!",
+					"enter_battery_data": "Enter battery barcode data",
+					"sort": "No.",
+					"batch": "Batch",
+					"tray": "Tray",
+					"lot": "No.",
+					"class_type": "Grade Type",
+					"class": "Grade",
+					"previous_process": "Previous Process",
+					"current_process": "Current Process",
+					"active_status": "Activation Status",
+					"prompt": "Notice",
+					"re_activate_success": "Re-activation successful",
+					"rethrow_activation_failed": "Re-activation failed",
+					"re_activate_warning": "Activating will skip current process. Proceed?",
+					"verify_data_before_action": "Verify battery data before re-activation"
 				}
 			},
 			"alert_center": {