diff --git a/bin/main/templates/menu21/freeze_and_thaw.ftl b/bin/main/templates/menu21/freeze_and_thaw.ftl
index 9697eac..7b12511 100644
--- a/bin/main/templates/menu21/freeze_and_thaw.ftl
+++ b/bin/main/templates/menu21/freeze_and_thaw.ftl
@@ -10,11 +10,11 @@
 </style>
 
 <div class="page-header">
-    <h3>Blocked & unblocked</h3>
+    <h3>Blocked & Unblocked</h3>
 </div>
 
 <table id="dg" class="easyui-datagrid" style="width:100%;height:460px;display: none;"
-       data-options="pagination: true, showFooter: true, singleSelect:true, fitColumns:true, 
+       data-options="pagination: true, showFooter: true, singleSelect:true, fitColumns:true,
        onSelect:onTableRowSelect, onLoadSuccess:onTableRowSelect,
        url:'/roll/getFreezeRolls',method:'POST',
        pageSize:20,toolbar:'#tb'">
@@ -53,7 +53,7 @@
        		冻结卷</a>
         </#if>
     </div>
-     
+
 </div>
 
 <div id="dlg" class="easyui-dialog for-scan" style="width:500px;display: none;"
@@ -111,10 +111,10 @@ function formatFreezeStatus(value, row){
 		return 'Unblocked';
 	}
 }
-    
+
 //表格选中事件
 function onTableRowSelect(index, row) {
-    
+
 }
 
 //查询功能
@@ -156,7 +156,7 @@ function saveFreezeRoll(){
 	//参数
 	let rollNo = $.trim($('#roll_no').val());
 	//设置参数
-	let postData = {'finalRollNo': rollNo, 'createdBy': username, 'updatedBy': username, 
+	let postData = {'finalRollNo': rollNo, 'createdBy': username, 'updatedBy': username,
 					'unfrozenFlag': 'N'};
 	//序列化
 	postData = JSON.stringify(postData);
@@ -208,15 +208,15 @@ function unfrozenRoll(rollNo){
     $.ajaxSetup({
 		  contentType: " application/x-www-form-urlencoded"});
 }
-   
 
-    
-   
 
-  
-  
-  
-  
+
+
+
+
+
+
+
 
 </script>
 
diff --git a/bin/main/templates/rework/rework_register.ftl b/bin/main/templates/rework/rework_register.ftl
index 149ec68..d48446c 100644
--- a/bin/main/templates/rework/rework_register.ftl
+++ b/bin/main/templates/rework/rework_register.ftl
@@ -7,7 +7,7 @@
 </style>
 
 <div class="page-header">
-    <h3>返工登记</h3>
+    <h3>Rework Registration</h3>
 </div>
 
 <table id="dg" class="easyui-datagrid" style="width:100%;height:460px;display: none;"
@@ -42,8 +42,8 @@
         to: <input class="easyui-datebox" id="createdDateTo" style="width:100px">
         <a href="#nowhere" id="queryLink" class="easyui-linkbutton" iconCls="icon-search">Search</a>
         &nbsp;&nbsp;&nbsp;
-        <a href="javascript:void(0)" id="tbAddBox" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanBoxModal()">登记返工箱</a>
-        <a href="javascript:void(0)" id="tbAddRoll" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanRollModal()">登记返工卷</a>
+        <a href="javascript:void(0)" id="tbAddBox" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanBoxModal()">Register Rework Box</a>
+        <a href="javascript:void(0)" id="tbAddRoll" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanRollModal()">Register Rework Roll</a>
     </div>
 </div>
 
@@ -51,7 +51,7 @@
 <div id="dlgBoxDtls" class="easyui-dialog" style="width:600px;display: none;" closed="true" data-options="modal:true" >
     <form method="post" novalidate onsubmit="return false;" style="margin:0; padding: 20px 20px">
         <div style="margin-bottom:10px">
-        	<label>箱号:</label>
+        	<label>Box No:</label>
             <input id="scan_box_no" name="boxNo" style="width: 75%; margin-left: 10px;">
         </div>
     </form>
@@ -61,8 +61,8 @@
         <tr>
             <th data-options="field:'boxNo',width:100">Box No</th>
             <th data-options="field:'rollNums',width:80">Roll Qty</th>
-            <th data-options="field:'registerBy',width:80">登记人</th>
-            <th data-options="field:'registerDate',width:150,align:'center', formatter: formatStringTime">登记日期</th>
+            <th data-options="field:'registerBy',width:80">Registered By</th>
+            <th data-options="field:'registerDate',width:150,align:'center', formatter: formatStringTime">Registration Date</th>
         </tr>
         </thead>
     </table>
@@ -83,8 +83,8 @@
         	<th data-options="field:'boxNo',width:100">Box No</th>
             <th data-options="field:'finalRollNo',width:100">Roll No</th>
             <th data-options="field:'rollQty',width:80">Quantity</th>
-            <th data-options="field:'registerBy',width:80">登记人</th>
-            <th data-options="field:'registerDate',width:150,align:'center', formatter: formatStringTime">登记日期</th>
+            <th data-options="field:'registerBy',width:80">Registered By</th>
+            <th data-options="field:'registerDate',width:150,align:'center', formatter: formatStringTime">Registration Date</th>
             <th data-options="field:'status',width:80">Status</th>
         </tr>
         </thead>
@@ -138,7 +138,7 @@ var currentRow;
             var p = n.split(',');
             if (p && p.length >= 3){
                 $("#revNo").textbox("setValue", p[2]);
-            } 
+            }
     }
 
     $.extend($.fn.validatebox.defaults.rules, {
@@ -164,8 +164,8 @@ var currentRow;
     function myparser(s){
         if(s) return new Date(s);
     }
-    
-    
+
+
 /* 选中行 */
 function onTableRowSelect(index, row) {
     var noRowSelect = !!!row;
@@ -188,7 +188,7 @@ $("#queryLink").click(function(){
 
 /* 查询返工单登记的箱 */
 function scanBoxModal(){
-	$('#dlgBoxDtls').dialog('open').dialog('center').dialog('setTitle',currentRow.orderNo+'中的登记箱');
+	$('#dlgBoxDtls').dialog('open').dialog('center').dialog('setTitle','Registered Boxes in '+currentRow.orderNo);
     var opts = $('#rework_boxs').datagrid('options');
 	opts.queryParams = {'orderNo': currentRow.orderNo};
     $("#rework_boxs").datagrid({url: "/rework/getReworkRegisterBoxs"});
@@ -197,12 +197,12 @@ function scanBoxModal(){
     //获取焦点
     $("#scan_box_no").focus();
 }
-   
+
 /* 返工箱的操作 */
 $("#scan_box_no").on("keyup", function(event){
     var boxNo = $(this).val();
     if(!boxNo || '' === boxNo){
-    	$.messager.show({title: 'Point', msg: '请扫描登记的箱号!', timeout: 1500, showType: 'slide'});
+    	$.messager.show({title: 'Point', msg: 'Please scan the registered box number!', timeout: 1500, showType: 'slide'});
     	return false;
     }
     if(event.keyCode == 13){
@@ -237,7 +237,7 @@ $("#scan_box_no").on("keyup", function(event){
 
 /* 查询返工单登记的卷 */
 function scanRollModal(){
-	$('#dlgRollDtls').dialog('open').dialog('center').dialog('setTitle',currentRow.orderNo+'中的登记卷记录');
+	$('#dlgRollDtls').dialog('open').dialog('center').dialog('setTitle','Registered Rolls in '+currentRow.orderNo);
     var opts = $('#rework_rolls').datagrid('options');
 	opts.queryParams = {'orderNo': currentRow.orderNo};
     $("#rework_rolls").datagrid({url: "/rework/getReworkRegisterRolls"});
@@ -246,12 +246,12 @@ function scanRollModal(){
     //获取焦点
     $("#scan_roll_no").focus();
 }
-   
+
 /* 返工箱的操作 */
 $("#scan_roll_no").on("keyup", function(event){
     var finalRollNo = $(this).val();
     if(!finalRollNo || '' === finalRollNo){
-    	$.messager.show({title: 'Point', msg: '请扫描登记的卷号!', timeout: 1500, showType: 'slide'});
+    	$.messager.show({title: 'Point', msg: 'Please scan the registered roll number!', timeout: 1500, showType: 'slide'});
     	return false;
     }
     if(event.keyCode == 13){
@@ -286,8 +286,8 @@ $("#scan_roll_no").on("keyup", function(event){
 
 /* 查询已经登记的卷信息 */
 function seachRegisterRolls(){
-	
-	$('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle',currentRow.orderNo+'中的登记卷记录');
+
+	$('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle','Registered Rolls in '+currentRow.orderNo);
     var opts = $('#show_rework_rolls').datagrid('options');
     var searchStatus = $('#search_status').combobox('getValue');
 	opts.queryParams = {'orderNo': currentRow.orderNo, 'status': searchStatus};
@@ -296,7 +296,7 @@ function seachRegisterRolls(){
 
 /* 展示当前卷的信息 */
 function viewRollsModal(orderNo){
-	$('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle',orderNo+'中的登记卷记录');
+	$('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle','Registered Rolls in '+orderNo);
     var opts = $('#show_rework_rolls').datagrid('options');
 	opts.queryParams = {'orderNo': orderNo, 'status': 'ALL'};
 	$('#search_status').combobox('setValue', 'ALL');
@@ -306,7 +306,7 @@ function viewRollsModal(orderNo){
 //检查卷信息
 function formatAction(value, row){
 	return "<a href='javascript:viewRollsModal(\""+row.orderNo+"\")'>Roll detail</a>";
-}   
+}
 
     var delay = (function(){
         var timer = 0;
diff --git a/bin/main/templates/system/system_info.ftl b/bin/main/templates/system/system_info.ftl
index d8e14a5..76ea673 100644
--- a/bin/main/templates/system/system_info.ftl
+++ b/bin/main/templates/system/system_info.ftl
@@ -13,7 +13,7 @@
 </style>
 
 <div class="page-header">
-    <h3>系统参数维护</h3>
+    <h3>System Parameter Maintenance</h3>
 </div>
 
 <!-- 页面表单 -->
@@ -24,14 +24,14 @@
     <thead>
     <tr>
         <th data-options="field:'site',width:100">Site</th>
-        <th data-options="field:'type',width:200">配置类型 (Type)</th>
-        <th data-options="field:'secondType',width:150">二级类型 (Second Type)</th>
-        <th data-options="field:'baseData',width:200">配置参数 (Base Data)</th>
-        <th data-options="field:'baseDesc',width:250">配置描述 (Base Desc)</th>
-        <th data-options="field:'status',width:80">状态 (Status)</th>
-        <th data-options="field:'sortNo',width:80">排序号</th>
-        <th data-options="field:'remark',width:200">备注 (Remark)</th>
-        <th data-options="field:'dataType',width:100">数据类型</th>
+        <th data-options="field:'type',width:200">Configuration Type (Type)</th>
+        <th data-options="field:'secondType',width:150">Secondary Type (Second Type)</th>
+        <th data-options="field:'baseData',width:200">Configuration Parameter (Base Data)</th>
+        <th data-options="field:'baseDesc',width:250">Configuration Description (Base Desc)</th>
+        <th data-options="field:'status',width:80">Status</th>
+        <th data-options="field:'sortNo',width:80">Sort No.</th>
+        <th data-options="field:'remark',width:200">Remark</th>
+        <th data-options="field:'dataType',width:100">Data Type</th>
     </tr>
     </thead>
 </table>
@@ -39,8 +39,8 @@
 <!-- 页面的查询框 -->
 <div id="tb" style="padding:10px 5px;display: none;">
     <div>
-        配置类型(Type): <input class="easyui-textbox" id="searchType" style="width:150px">
-        二级类型(Second Type): <input class="easyui-textbox" id="searchSecondType" style="width:150px">
+        Configuration Type (Type): <input class="easyui-textbox" id="searchType" style="width:150px">
+        Secondary Type (Second Type): <input class="easyui-textbox" id="searchSecondType" style="width:150px">
         <a href="#nowhere" id="queryLink" class="easyui-linkbutton" iconCls="icon-search">Query</a>
         &nbsp;&nbsp;&nbsp;
         <a href="javascript:void(0)" id="tbAdd" class="easyui-linkbutton" iconCls="icon-add" onclick="newSystemInfoModal()">New</a>
@@ -60,18 +60,18 @@
                 <input id="site" name="site" class="easyui-textbox" label="Site:" style="width:98%" value="ALL">
             </div>
             <div class="input-div" style="margin-bottom:10px">
-                <input id="type" name="type" class="easyui-textbox" required="true" label="配置类型 (Type):" style="width:98%">
+                <input id="type" name="type" class="easyui-textbox" required="true" label="Configuration Type (Type):" style="width:98%">
             </div>
             <div class="input-div" style="margin-bottom:10px">
-                <input id="secondType" name="secondType" class="easyui-textbox" required="true" label="二级类型:" style="width:98%">
+                <input id="secondType" name="secondType" class="easyui-textbox" required="true" label="Secondary Type:" style="width:98%">
             </div>
             <div class="input-div" style="margin-bottom:10px; line-height: 30px;">
-                <label style="display:inline-block; width:150px;">配置参数 (Base Data):</label>
+                <label style="display:inline-block; width:150px;">Configuration Parameter (Base Data):</label>
                 <!-- 移除 name="baseData" 属性，防止表单自动收集并和 onSubmit 的传参冲突 -->
                 <input id="baseDataCheckbox" type="checkbox" value="Y" style="vertical-align: middle; margin-top: -2px; width: 18px; height: 18px;">
             </div>
             <div class="input-div" style="margin-bottom:10px">
-                <input id="baseDesc" name="baseDesc" class="easyui-textbox" label="配置描述 (Base Desc):" style="width:98%">
+                <input id="baseDesc" name="baseDesc" class="easyui-textbox" label="Configuration Description (Base Desc):" style="width:98%">
             </div>
             <div class="input-div" style="margin-bottom:10px">
                 <input id="remark" name="remark" class="easyui-textbox" label="备注 (Remark):" style="width:98%">
@@ -115,7 +115,7 @@ $(function () {
 
     var url;
     function newSystemInfoModal(){
-        $('#dlg').dialog('open').dialog('center').dialog('setTitle','新增系统参数');
+        $('#dlg').dialog('open').dialog('center').dialog('setTitle','Add System Parameter');
         $('#fm').form('clear');
         url = '/system/system_info/save';
         $('#addId').textbox("setValue", 0);
@@ -133,10 +133,10 @@ $(function () {
     function saveSystemInfo(){
         let type = $.trim($("#type").textbox('getValue'));
         if(null == type || '' == type){
-            $.messager.alert('error', '请填写配置类型 (Type)!', 'error');
+            $.messager.alert('error', 'Please enter a configuration type (Type)!', 'error');
             return false;
         }
-        
+
         let baseData = '';
         if ($('#baseDataCheckbox').prop('checked')) {
             baseData = 'Y';
@@ -166,26 +166,26 @@ $(function () {
     function editSystemInfoModal(){
         var row = $('#dg').datagrid('getSelected');
         if (row){
-            $('#dlg').dialog('open').dialog('center').dialog('setTitle','修改系统参数');
+            $('#dlg').dialog('open').dialog('center').dialog('setTitle','Edit System Parameter');
             $('#fm').form('load', row);
-            
+
             // 根据数据回显复选框
             if (row.baseData === 'Y') {
                 $('#baseDataCheckbox').prop('checked', true);
             } else {
                 $('#baseDataCheckbox').prop('checked', false);
             }
-            
+
             url = '/system/system_info/save';
             $('#addId').textbox("setValue", row.id);
-            
+
             // 修改时 type 不可编辑
             $('#type').textbox('textbox').attr('readonly','readonly');
             $('#secondType').textbox('textbox').attr('readonly','readonly');
             $('#type').textbox('textbox').css('background-color', '#f0f0f0'); // 给出不可编辑的视觉反馈
             $('#secondType').textbox('textbox').css('background-color', '#f0f0f0'); // 给出不可编辑的视觉反馈
         }else{
-            $.messager.alert('Warning','请选择一行!', 'warning');
+            $.messager.alert('Warning','Please select a row first!', 'warning');
         }
     }
 
diff --git a/src/main/resources/templates/basic/part.ftl b/src/main/resources/templates/basic/part.ftl
index 39005bf..acd7c4e 100644
--- a/src/main/resources/templates/basic/part.ftl
+++ b/src/main/resources/templates/basic/part.ftl
@@ -54,10 +54,10 @@
         <th data-options="field:'primaryMaterialNo',width:125">Primary Material No</th>
         <th data-options="field:'packageQty',width:80,align:'right'">Std Pack Qty</th>
         <th data-options="field:'boxQty',width:80,align:'right'">Std Box Qty</th>
-        <th data-options="field:'projectCode',width:120">project code</th>
+        <th data-options="field:'projectCode',width:120">Project Code</th>
         <th data-options="field:'labelType',width:80">Label Type</th>
         <th data-options="field:'codeType',width:80">Code Type</th>
-        <th data-options="field:'productStyle',width:80">Product Style</th>
+        <th data-options="field:'productStyle',width:100">Product Style</th>
         <th data-options="field:'bu',width:60">Bu</th>
         <th data-options="field:'checkProductDateFlag',width:160">Allow Different Prod Date</th>
         <th data-options="field:'serialApn',width:70">SerialApn</th>
diff --git a/src/main/resources/templates/material/roll_batch_query.ftl b/src/main/resources/templates/material/roll_batch_query.ftl
index f56f30e..92cd56c 100644
--- a/src/main/resources/templates/material/roll_batch_query.ftl
+++ b/src/main/resources/templates/material/roll_batch_query.ftl
@@ -13,11 +13,11 @@
     <tr>
         <th data-options="field:'orderNo',width:120">SO No</th>
         <th data-options="field:'rollNo',width:120">Roll No</th>
-        <th data-options="field:'operationNo',width:80,align:'center'">Operation No</th>
-        <th data-options="field:'operationName',width:100">Operation Name</th>
+        <th data-options="field:'operationNo',width:100,align:'center'">Operation No</th>
+        <th data-options="field:'operationName',width:120">Operation Name</th>
         <th data-options="field:'componentPartNo',width:150">Material Part No</th>
-        <th data-options="field:'customerBatchNo',width:120">Customer Batch No</th>
-        <th data-options="field:'isSemiOrder',width:80,align:'center'">Is Semi-finished</th>
+        <th data-options="field:'customerBatchNo',width:150">Customer Batch No</th>
+        <th data-options="field:'isSemiOrder',width:120,align:'center'">Is Semi-finished</th>
         <th data-options="field:'startRow',width:80,align:'center'">Start Row</th>
         <th data-options="field:'endRow',width:80,align:'center'">To Row No</th>
         <th data-options="field:'columnSortIndex',width:100">No. of Cross</th>
diff --git a/src/main/resources/templates/menu21/freeze_and_thaw.ftl b/src/main/resources/templates/menu21/freeze_and_thaw.ftl
index 31dbd16..3693c75 100644
--- a/src/main/resources/templates/menu21/freeze_and_thaw.ftl
+++ b/src/main/resources/templates/menu21/freeze_and_thaw.ftl
@@ -10,11 +10,11 @@
 </style>
 
 <div class="page-header">
-    <h3>Blocked & unblocked</h3>
+    <h3>Blocked & Unblocked</h3>
 </div>
 
 <table id="dg" class="easyui-datagrid" style="width:100%;height:460px;display: none;"
-       data-options="pagination: true, showFooter: true, singleSelect:true, fitColumns:true, 
+       data-options="pagination: true, showFooter: true, singleSelect:true, fitColumns:true,
        onSelect:onTableRowSelect, onLoadSuccess:onTableRowSelect,
        url:'/roll/getFreezeRolls',method:'POST',
        pageSize:20,toolbar:'#tb'">
@@ -53,7 +53,7 @@
        		Freeze Roll</a>
         </#if>
     </div>
-     
+
 </div>
 
 <div id="dlg" class="easyui-dialog for-scan" style="width:500px;display: none;"
@@ -111,10 +111,10 @@ function formatFreezeStatus(value, row){
 		return 'Unblocked';
 	}
 }
-    
+
 // Table selection event
 function onTableRowSelect(index, row) {
-    
+
 }
 
 // Query function
@@ -156,7 +156,7 @@ function saveFreezeRoll(){
 	// Parameters
 	let rollNo = $.trim($('#roll_no').val());
 	// Set parameters
-	let postData = {'finalRollNo': rollNo, 'createdBy': username, 'updatedBy': username, 
+	let postData = {'finalRollNo': rollNo, 'createdBy': username, 'updatedBy': username,
 					'unfrozenFlag': 'N'};
 	// Serialize
 	postData = JSON.stringify(postData);
@@ -208,15 +208,15 @@ function unfrozenRoll(rollNo){
     $.ajaxSetup({
 		  contentType: " application/x-www-form-urlencoded"});
 }
-   
 
-    
-   
 
-  
-  
-  
-  
+
+
+
+
+
+
+
 
 </script>
 
diff --git a/src/main/resources/templates/query/final_roll_batch_hist.ftl b/src/main/resources/templates/query/final_roll_batch_hist.ftl
index 8c2c343..d370d23 100644
--- a/src/main/resources/templates/query/final_roll_batch_hist.ftl
+++ b/src/main/resources/templates/query/final_roll_batch_hist.ftl
@@ -24,7 +24,7 @@
         <th data-options="field:'isSemiOrder',width:100,align:'center',formatter:formatSemiOrder">Is Semi-finished Order</th>
         <th data-options="field:'rowIndex',width:80,align:'center'">Row</th>
         <th data-options="field:'columnIndex',width:80,align:'center'">Column</th>
-        <th data-options="field:'startRow',width:80,align:'center'">From Row No</th>
+        <th data-options="field:'startRow',width:100,align:'center'">From Row No</th>
         <th data-options="field:'endRow',width:80,align:'center'">To Row No</th>
         <th data-options="field:'columnSortIndex',width:140,align:'center'">Column Position</th>
         <th data-options="field:'status',width:100,align:'center'">Status</th>
@@ -114,7 +114,7 @@
             if (!finalRollNo) {
             	finalRollNo = '';
             }
-          
+
 
             var finalSerialNo = $.trim($("#finalSerialNo").textbox("getValue"));
             if (!finalSerialNo) {
diff --git a/src/main/resources/templates/query/order_batch_hist.ftl b/src/main/resources/templates/query/order_batch_hist.ftl
index 1e0a5ce..1bb5ba5 100644
--- a/src/main/resources/templates/query/order_batch_hist.ftl
+++ b/src/main/resources/templates/query/order_batch_hist.ftl
@@ -17,13 +17,13 @@
         <th data-options="field:'id',width:60,align:'center'">ID</th>
         <th data-options="field:'orderNo',width:100,align:'center'">SO No</th>
         <th data-options="field:'rollNo',width:100,align:'center'">Roll No</th>
-        <th data-options="field:'operationNo',width:60,align:'center'">Operation No</th>
-        <th data-options="field:'operationName',width:80,align:'center'">Operation Name</th>
+        <th data-options="field:'operationNo',width:80,align:'center'">Operation No</th>
+        <th data-options="field:'operationName',width:90,align:'center'">Operation Name</th>
         <th data-options="field:'sortNo',width:60,align:'center'">Sort No</th>
         <th data-options="field:'componentPartNo',width:120,align:'center'">Component Part No</th>
         <th data-options="field:'customerBatchNo',width:120,align:'center'">Customer Batch No</th>
-        <th data-options="field:'isSemiOrder',width:80,align:'center',formatter:formatSemiOrder">Is Semi-finished Order</th>
-        <th data-options="field:'startRow',width:60,align:'center'">From Row No</th>
+        <th data-options="field:'isSemiOrder',width:150,align:'center',formatter:formatSemiOrder">Is Semi-finished Order</th>
+        <th data-options="field:'startRow',width:80,align:'center'">From Row No</th>
         <th data-options="field:'endRow',width:60,align:'center'">To Row No</th>
         <th data-options="field:'columnSortIndex',width:100,align:'center'">Column Position</th>
         <th data-options="field:'status',width:80,align:'center'">Status</th>
@@ -58,13 +58,13 @@
         var orderNo = $("#orderNo").val();
         var rollNo = $("#rollNo").val();
         var serialNo = $("#serialNo").val();
-        
+
         // At least one query condition is required
         if (!orderNo && !rollNo && !serialNo) {
             $.messager.alert('Point', 'Please enter at least one query condition!', 'warning');
             return;
         }
-        
+
         $('#dg').datagrid({
             url: '/material/querOrderBatchHist',
             queryParams: {
@@ -74,7 +74,7 @@
             }
         });
     });
-    
+
     // Reset button
     $("#resetLink").click(function(){
         $("#orderNo").textbox('clear');
diff --git a/src/main/resources/templates/rework/rework_register.ftl b/src/main/resources/templates/rework/rework_register.ftl
index edc1c7e..be2d7b8 100644
--- a/src/main/resources/templates/rework/rework_register.ftl
+++ b/src/main/resources/templates/rework/rework_register.ftl
@@ -42,16 +42,16 @@
         to: <input class="easyui-datebox" id="createdDateTo" style="width:100px">
         <a href="#nowhere" id="queryLink" class="easyui-linkbutton" iconCls="icon-search">Search</a>
         &nbsp;&nbsp;&nbsp;
-        <a href="javascript:void(0)" id="tbAddBox" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanBoxModal()">登记返工箱</a>
-        <a href="javascript:void(0)" id="tbAddRoll" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanRollModal()">登记返工卷</a>
+        <a href="javascript:void(0)" id="tbAddBox" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanBoxModal()">Register Rework Box</a>
+        <a href="javascript:void(0)" id="tbAddRoll" data-options="disabled:true" class="easyui-linkbutton" iconCls="icon-add" onclick="scanRollModal()">Register Rework Roll</a>
     </div>
 </div>
 
-<!-- 扫描返工箱记录 -->
+<!-- Scan rework box records -->
 <div id="dlgBoxDtls" class="easyui-dialog" style="width:600px;display: none;" closed="true" data-options="modal:true" >
     <form method="post" novalidate onsubmit="return false;" style="margin:0; padding: 20px 20px">
         <div style="margin-bottom:10px">
-        	<label>箱号:</label>
+        	<label>Box No:</label>
             <input id="scan_box_no" name="boxNo" style="width: 75%; margin-left: 10px;">
         </div>
     </form>
@@ -68,7 +68,7 @@
     </table>
 </div>
 
-<!-- 扫描返工卷记录 -->
+<!-- Scan rework roll records -->
 <div id="dlgRollDtls" class="easyui-dialog" style="width:700px;display: none;" closed="true" data-options="modal:true" >
     <form id="fm_scan_roll"  method="post" novalidate onsubmit="return false;" style="margin:0; padding: 20px 20px">
         <div style="margin-bottom:10px">
@@ -92,7 +92,7 @@
 </div>
 
 
-<!-- 扫描返工卷记录 -->
+<!-- Display registered roll records -->
 <div id="dlgRollsShow" class="easyui-dialog" style="width: 820px;display: none;" closed="true" data-options="modal:true" >
  	<form id="fm_show_roll"  method="post" novalidate onsubmit="return false;" style="margin:0; padding: 20px 20px">
         <div style="margin-bottom:10px">
@@ -217,16 +217,16 @@ $("#scan_box_no").on("keyup", function(event){
                  $("#rework_boxs").datagrid('reload');
                 // Prompt message
                 $.messager.show({title: 'Point', msg: data.msg, timeout: 1500, showType: 'slide'});
-              	//清空
+               // Clear
                 $("#scan_box_no").val("");
                 // Get focus
                 $("#scan_box_no").focus();
             }else{
-            	//清空
+            	// Clear
                 $("#scan_box_no").val("");
             	// Prompt and get focus
                 $.messager.alert('Error', data.msg, 'error', function () {
-                    $("#scan_box_no").focus();  // 弹窗关闭后让输入框获取焦点
+                    $("#scan_box_no").focus();  // Get focus after dialog closes
                 });
             }
         })
@@ -266,16 +266,16 @@ $("#scan_roll_no").on("keyup", function(event){
                  $("#rework_rolls").datagrid('reload');
                 // Prompt message
                 $.messager.show({title: 'Point', msg: data.msg, timeout: 1500, showType: 'slide'});
-              	//清空
+              	// Clear
                 $("#scan_roll_no").val("");
                 // Get focus
                 $("#scan_roll_no").focus();
             }else{
-            	//清空
+            	// Clear
                 $("#scan_roll_no").val("");
             	// Prompt and get focus
                 $.messager.alert('Error', data.msg, 'error', function () {
-                    $("#scan_roll_no").focus();  // 弹窗关闭后让输入框获取焦点
+                    $("#scan_roll_no").focus();  // Get focus after dialog closes
                 });
             }
         })
@@ -294,16 +294,16 @@ function seachRegisterRolls(){
     $("#show_rework_rolls").datagrid({url: "/rework/getReworkRegisterRolls"});
 }
 
-/* 展示当前卷的信息 */
+/* Display current roll information */
 function viewRollsModal(orderNo){
-	$('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle',orderNo+'中的登记卷记录');
+	$('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle','Registered roll records for '+orderNo);
     var opts = $('#show_rework_rolls').datagrid('options');
 	opts.queryParams = {'orderNo': orderNo, 'status': 'ALL'};
 	$('#search_status').combobox('setValue', 'ALL');
     $("#show_rework_rolls").datagrid({url: "/rework/getReworkRegisterRolls"});
 }
 
-//检查卷信息
+// Check roll information
 function formatAction(value, row){
 	return "<a href='javascript:viewRollsModal(\""+row.orderNo+"\")'>Roll detail</a>";
 }
diff --git a/src/main/resources/templates/system/system_info.ftl b/src/main/resources/templates/system/system_info.ftl
index 94ca2a4..a99aa15 100644
--- a/src/main/resources/templates/system/system_info.ftl
+++ b/src/main/resources/templates/system/system_info.ftl
@@ -28,9 +28,9 @@
         <th data-options="field:'secondType',width:180">Second Level Type (Second Type)</th>
         <th data-options="field:'baseData',width:200">Configuration Parameter (Base Data)</th>
         <th data-options="field:'baseDesc',width:250">Configuration Description (Base Desc)</th>
-        <th data-options="field:'status',width:80">Status (Status)</th>
+        <th data-options="field:'status',width:80">Status</th>
         <th data-options="field:'sortNo',width:80">Sort No</th>
-        <th data-options="field:'remark',width:200">Remark (Remark)</th>
+        <th data-options="field:'remark',width:200">Remark</th>
         <th data-options="field:'dataType',width:100">Data Type</th>
     </tr>
     </thead>
@@ -71,10 +71,10 @@
                 <input id="baseDataCheckbox" type="checkbox" value="Y" style="vertical-align: middle; margin-top: -2px; width: 18px; height: 18px;">
             </div>
             <div class="input-div" style="margin-bottom:10px">
-                <input id="baseDesc" name="baseDesc" class="easyui-textbox" label="配置描述 (Base Desc):" style="width:98%">
+                <input id="baseDesc" name="baseDesc" class="easyui-textbox" label="Base Desc:" style="width:98%">
             </div>
             <div class="input-div" style="margin-bottom:10px">
-                <input id="remark" name="remark" class="easyui-textbox" label="备注 (Remark):" style="width:98%">
+                <input id="remark" name="remark" class="easyui-textbox" label="Remark:" style="width:98%">
             </div>
         </div>
     </form>
@@ -133,7 +133,7 @@ $(function () {
     function saveSystemInfo(){
         let type = $.trim($("#type").textbox('getValue'));
         if(null == type || '' == type){
-            $.messager.alert('error', '请填写配置类型 (Type)!', 'error');
+            $.messager.alert('error', 'Please enter a configuration type(Type)!', 'error');
             return false;
         }