Merge remote-tracking branch 'upstream/master'

assets/local/localization_en.json

@@ -273,11 +273,16 @@
     "box.mix.number":"Carton number",
     "box.mix.desc":"Description",
     "box.info.title":"Carton",
+    "box.popupmenu.active":"Active Cartons",
+    "box.popupmenu.delivered":"Delivered Cartons",
+    "box.cargo.total":"Total Weight",
     "Boxes End ================================================================":"",
     
     "Delivery Start ================================================================":"",
     "delivery.title":"Deliveries",
     "delivery":"Deliveries",
+    "delivery.popupmenu.active":"Active Cartons",
+    "delivery.popupmenu.delivered":"Delivered Cartons",
     "Delivery End ================================================================":"",
 
     "FCS Shipment Start ================================================================":"",
@@ -306,7 +311,7 @@
     "Shipment Start ================================================================":"",
     "shipment": "Shipments",
     "shipment.title": "Shipments",
-    "shipment.new": "Request shipment",
+    "shipment.new": "New shipment",
     "shipment.new.title": "New Shipment",
     "shipment.edit.title": "Edit Shipment",
     "shipment.type": "Pickup/drop-off",
@@ -328,6 +333,11 @@
     "shipment.box.width":"Width",
     "shipment.box.height":"Height",
     "shipment.box.add":"Add carton",
+    "shipment.cargo.total":"Total Weight",
+    "shipment.popupmenu.active":"Active Shipments",
+    "shipment.popupmenu.delivered":"Delivered Shipments",
+    "shipment.create":"Create shipment",
+    "shipment.update":"Update shipment",
     "Shipment End ================================================================":"",
 
     "Rate Start ================================================================":"",

assets/local/localization_mu.json

@@ -273,11 +273,16 @@
     "box.mix.number":"သေတ္တာ နံပါတ်",
     "box.mix.desc":"ဖော်ပြချက်",
     "box.info.title":"သေတ္တာ",
+    "box.popupmenu.active":"လာမည့် သေတ္တာများ",
+    "box.popupmenu.delivered":"ပို့ပြီးသော သေတ္တာများ",
+    "box.cargo.total":"စုစုပေါင်း အလေးချိန်",
     "Boxes End ================================================================":"",
 
     "Delivery Start ================================================================":"",
     "delivery.title":"ပေးပို့ရန်များ",
     "delivery":"ပေးပို့ရန်များ",
+    "delivery.popupmenu.active":"လာမည့် သေတ္တာများ",
+    "delivery.popupmenu.delivered":"ပို့ပြီးသော သေတ္တာများ",
     "Delivery End ================================================================":"",
 
     "FCS Shipment Start ================================================================":"",
@@ -295,12 +300,12 @@
     "FCSshipment.final_destination":"ဆိုက်ရောက်နေရာ",
     "FCSshipment.status":"အခြေအနေ",
     "FCSshipment.remark":"မှတ်ချက်",
-    "FCSshipment.commercial_invoice":"Download Commercial Invoice",
-    "FCSshipment.packing_list":"Download Packing List",
-    "FCSshipment.dms":"Download DMS",
-    "FCSshipment.cargo_manifest":"Download Cargo Manifest",
-    "FCSshipment.create":"FCS တင်ပို့ခြင်းပြုလုပ်ရန်",
-    "FCSshipment.update":"FCS တင်ပို့ခြင်းပြုပြင်ရန်",
+    "FCSshipment.commercial_invoice":"ငွေတောင်းခံလွှာကိုဒေါင်းမည်",
+    "FCSshipment.packing_list":"ထုပ်ပိုးစာရင်းကိုဒေါင်းမည်",
+    "FCSshipment.dms":"DMS ကိုဒေါင်းမည်",
+    "FCSshipment.cargo_manifest":"ကုန်ပစ္စည်းကိုဒေါင်းမည်",
+    "FCSshipment.create":"FCS တင်ပို့ခြင်းပြုလုပ်မည်",
+    "FCSshipment.update":"FCS တင်ပို့ခြင်းပြုပြင်မည်",
     "FCS Shipment End ================================================================":"",
 
     "Shipment Start ================================================================":"",
@@ -309,25 +314,30 @@
     "shipment.new": "ပို့ဆောင်ခြင်း အသစ်",
     "shipment.new.title": "ပို့ဆောင်ခြင်း အသစ်",
     "shipment.edit.title": "ပို့ဆောင်ခြင်း ပြင်ဆင်ခြင်း",
-    "shipment.type": "Pickup/Drop-off",
-    "shipment.date": "Pickup date",
-    "shipment.date.time": "Pickup date/Time",
-    "shipment.time": "Pickup time",
+    "shipment.type": "Pickup/Drop-off ရွေးရန်",
+    "shipment.date": "Pickup နေ့စွဲ",
+    "shipment.date.time": "Pickup နေ့စွဲ/အချိန်",
+    "shipment.time": "Pickup အချိန်",
     "shipment.location_time": "Pickup location / Time",
-    "shipment.location": "Pickup location",
+    "shipment.location": "Pickup လိပ်စာ",
     "shipment.information": "Pickup informations",
     "shipment.recipient_information": "Recipient informations",
-    "shipment.from":"From",
-    "shipment.to":"To",
-    "shipment.box.delivery":"Delivery address",
+    "shipment.from":"အချိန်(မှ)",
+    "shipment.to":"အချိန်(သို့)",
+    "shipment.box.delivery":"ပို့ဆောင်ရမည့်လိပ်စာ",
     "shipment.handling.fee":"Handling fee/Courier fee",
-    "shipment.box.cargo.type":"Cargo types",
-    "shipment.box.dimemsion":"Dimension",
-    "shipment.box.shipment.weight":"Shipment weight",
-    "shipment.box.length":"Length",
-    "shipment.box.width":"Width",
-    "shipment.box.height":"Height",
-    "shipment.box.add":"Add carton",
+    "shipment.box.cargo.type":"ကုန်ပစ္စည်းအမျိုးအစားများ",
+    "shipment.box.dimemsion":"အရွယ်အစား",
+    "shipment.box.shipment.weight":"တင်ပို့အလေးချိန်",
+    "shipment.box.length":"အလျား",
+    "shipment.box.width":"အနံ",
+    "shipment.box.height":"အမြင့်",
+    "shipment.box.add":"သေတ္တာထည့်မည်",
+    "shipment.cargo.total":"စုစုပေါင်း အလေးချိန်",
+    "shipment.popupmenu.active":"လာမည့် အထုပ်များ",
+    "shipment.popupmenu.delivered":"ပို့ပြီးသော အထုပ်များ",
+    "shipment.create":"ပို့ဆောင်ခြင်း ပြုလုပ်မည်",
+    "shipment.update":"ပို့ဆောင်ခြင်းပြုပြင်မည်",
     "Shipment End ================================================================":"",
 
     "Rate Start ================================================================":"",