Merge branch 'master' of https://git.mokkon.com/sainw/fcs

assets/local/localization_en.json

@@ -287,6 +287,11 @@
     "box.cargo.total":"Total Weight",
     "box.delete.confirm":"Delete carton?",
     "box.mix.carton":"Go into mix carton",
+    "box.carton_size":"Carton Size",
+    "box.carton_size.title":"Carton Sizes",
+    "box.carton_size_remove.confirm":"Remove this carton size?",
+    "box.carton_size.name":"Name",
+    "box.cargo_total_title":"Edit Total Weight",
     "Boxes End ================================================================":"",
     
     "Delivery Start ================================================================":"",
@@ -539,5 +544,14 @@
     "processing.delete.confirm":"Delete this package?",
     "processing.edit.sub_title":"Processing",
     "processing.edit.complete.btn":"Complete processing",
+    "processing.new":"New Processing",
+    "processing.create":"New Processing",
+    "processing.update":"Update Processing",
+    "processing.consignee.name":"Consignee name",
+    "processing.shipper.name":"Shipper name",
+    "processing.package.select.btn":"Select",
+    "processing.package.create":"New Package",
+    "processing.package.update":"Update Package",
+    "processing.package.delete_confirm":"Remove this package?",
     "Processing End ================================================================":""
 }

assets/local/localization_mu.json

@@ -287,6 +287,11 @@
     "box.cargo.total":"စုစုပေါင်း အလေးချိန်",
     "box.delete.confirm":"Delete carton?",
     "box.mix.carton":"Go into mix carton",
+    "box.carton_size":"သေတ္တာ အရွယ်အစား",
+    "box.carton_size.title":"သေတ္တာ အရွယ်အစားများ",
+    "box.carton_size_remove.confirm":"Remove this carton size?",
+    "box.carton_size.name":"နာမည်",
+    "box.cargo_total_title":"စုစုပေါင်းအလေးချိန် ပြုပြင်မည်",
     "Boxes End ================================================================":"",
 
     "Delivery Start ================================================================":"",
@@ -540,6 +545,15 @@
     "processing.delete.confirm":"အထုပ်ကို ဖျက်မလား?",
     "processing.edit.sub_title":"မွမ်းမံခြင်း",
     "processing.edit.complete.btn":"မွမ်းမံခြင်း ပြီးဆုံးသည်",
+    "processing.new":"လုပ်ဆောင်ခြင်း အသစ်",
+    "processing.create":"လုပ်ဆောင်ခြင်း အသစ်",
+    "processing.update":"လုပ်ဆောင်ခြင်း ပြင်ဆင်ခြင်း",
+    "processing.consignee.name":"လက်ခံသူ အမည်",
+    "processing.shipper.name":"တင်ပို့သူ အမည်",
+    "processing.package.select.btn":"ရွေးချယ်မည်",
+    "processing.package.create":"အထုပ် အသစ်",
+    "processing.package.update":"အထုပ်  ပြင်ဆင်ခြင်း ",
+    "processing.package.delete_confirm":"Remove this package?",
     "Processing End ================================================================":""