解决冲突和补充

public/locales/en/common.json

@@ -25,6 +25,9 @@
   "Export": "Export",
   "Copy": "Copy",
 
+  "sureCancel": "Sure you want to cancel?",
+  "sureDelete":"Sure you want to delete?",
+
   "Table": {
     "Total": "Total {{total}} items"
   },

public/locales/en/products.json

@@ -57,14 +57,6 @@
   "operation": "Operation",
   "price": "Price",
 
-
-  "save":"save",
-  "edit":"edit",
-  "delete":"delete",
-  "cancel":"cancel",
-  "sureCancel":"Sure you want to cancel?",
-  "sureDelete":"Sure you want to delete?"
-
   "Quotation": "Quotation",
   "Offer": "Offer",
 
@@ -84,5 +76,12 @@
     "Child": "Child"
   },
 
+  "save":"save",
+  "edit":"edit",
+  "delete":"delete",
+  "cancel":"cancel",
+  "sureCancel":"Sure you want to cancel?",
+  "sureDelete":"Sure you want to delete?",
+
   "#": "#"
 }

public/locales/zh/common.json

@@ -25,6 +25,9 @@
   "Export": "导出",
   "Copy": "复制",
 
+  "sureCancel": "确定取消？",
+  "sureDelete":"确定删除？",
+
   "Table": {
     "Total": "共 {{total}} 条"
   },

public/locales/zh/products.json

@@ -37,28 +37,6 @@
   "AuditedBy": "审核人员",
   "AuditDate": "审核时间",
 
-  "Quotation": "报价",
-  "Offer": "报价",
-  "Unit": "单位",
-  "GroupSize": "人等",
-  "UseDates": "使用日期",
-
-  "Weekdays": "有效日/周X",
-  "OnWeekdays": "周: ",
-  "Unlimited": "不限",
-
-  "UseYear": "年份",
-
-  "AgeType": {
-    "Type": "人群",
-    "Adult": "成人",
-    "Child": "儿童"
-  },
-
-  "#": "#"
-  "Auditors": "审核人员",
-  "AuditDate": "审核时间",
-
   "productProject": "产品项目",
   "Code": "代码",
   "City": "城市",
@@ -81,10 +59,31 @@
   "validityPeriod":"有效期",
   "operation": "操作",
   "price": "价格",
+
+  "Quotation": "报价",
+  "Offer": "报价",
+  "Unit": "单位",
+  "GroupSize": "人等",
+  "UseDates": "使用日期",
+
+  "Weekdays": "有效日/周X",
+  "OnWeekdays": "周: ",
+  "Unlimited": "不限",
+
+  "UseYear": "年份",
+
+  "AgeType": {
+    "Type": "人群",
+    "Adult": "成人",
+    "Child": "儿童"
+  },
+
   "save":"保存",
   "edit":"编辑",
-  "cancel":"取消",
   "delete":"删除",
+  "cancel":"取消",
   "sureCancel": "确定取消？",
-  "sureDelete":"确定删除？"
+  "sureDelete":"确定删除？",
+
+  "#": "#"
 }