Merge remote-tracking branch 'upstream/master'

assets/local/localization_mu.json

@@ -92,6 +92,8 @@
 
     "Home Start ================================================================":"",
     "home.invitation.request.msg":"ဖိတ်ကြားမှု တောင်းဆိုသည်ကို လုပ်ဆောင်နေပါသည်!",
+    "home.search":"Tracking number ရိုက်ထဲ့ပါ",
+    "home.search.btn":"ရှာမည်",
     "Home End ================================================================":"",
 
     "Invite Start ================================================================":"",
@@ -109,7 +111,6 @@
     "user.fcs_id":"My FCS_ID",
     "user.shipping_address":"My USA shipping address",
     "user.deliveryAddress":"My delivery address",
-    "user.form.shipping_address":"ကုန်ပစ္စည်းပို့ဆောင်ရမည့်လိပ်စာ",
     "User End ================================================================":"",
 
     "Customer Start ================================================================":"",
@@ -142,15 +143,17 @@
     "Profile Start ================================================================":"",
     "profile.title":"ကျွန်ုပ် ပရိုဖိုင်",
     "profile.edit_title":"ကျွန်ုပ် ပရိုဖိုင်ကိုပြုပြင်ရန်",
+    "profile.edit.currency.title":"နှစ်သက်သော ငွေအမျိုးအစား",
     "profile.name":"နာမည်",
     "profile.phone": "ဖုန်းနံပါတ်",
     "profile.language": "ဘာသာစကားများ",
     "profile.logout": "အကောင့်ထွက်ရန်",
-    "profile.usa.shipping.address": "အမေရိကား ပစည်းပို့ရန်လိပ်စာ",
+    "profile.currency":"နှစ်သက်သော ငွေအမျိုးအစား",
+    "profile.usa.shipping.address": "အမေရိကား ပစ္စည်းပို့ရန်လိပ်စာ",
     "profile.logout.confirm":"အကောင့်ထွက်ရန်သေချာပြီလား?",
     "profile.devices":"ဖုန်းမော်ဒယ်အမျိုးအစားများ",
     "profile.email":"အီးမေးလ်",
-    "profile.privilege":"လုပ်ပိုင်ခွင့်",
+    "profile.privileges":"လုပ်ပိုင်ခွင့်များ",
     "Profile End ================================================================":"",
 
     "Package Start ================================================================":"",
@@ -176,6 +179,8 @@
     "package.rate":"Rate",
     "package.weight":"Weight",
     "package.amount":"Amount",
+    "package.popupmenu.active":"လာမည့် အထုပ်များ",
+    "package.popupmenu.delivered":"ပို့ပြီးသော အထုပ်များ",
     "Package End ================================================================":"",
 
     "Market Start ================================================================":"",
@@ -194,7 +199,7 @@
 
     "Payment Start ================================================================":"",
     "pm.title":"ငွေပေးချေစနစ်များ",
-    "pm.new":"ငွေပေးချေစနစ်အသစ်",
+    "pm.new":"ငွေပေးချေစနစ် အသစ်",
     "pm.update":"ငွေပေးချေစနစ် ပြင်ဆင်ခြင်း",
     "pm.btn":"ငွေပေးချေစနစ်များ",
     "pm.name":"အမည်",
@@ -224,7 +229,7 @@
     "Boxes Start ================================================================":"",
     "boxes.name":"သေတ္တာများ",
     "boxes.title":"Boxes",
-    "boxes.new":"သေတ္တာအသစ်",
+    "boxes.new":"သေတ္တာ အသစ်",
     "box.edit.title":"သေတ္တာ ပြင်ဆင်ခြင်း",
     "box.package.id":"Package ID",
     "box.package.desc":"Description",
@@ -285,16 +290,21 @@
     "FCS Shipment End ================================================================":"",
 
     "Shipment Start ================================================================":"",
-    "shipment": "Shipments",
-    "shipment.title": "SHIPMENTS",
-    "shipment.new": "New Shipment",
-    "shipment.edit.title": "PICKUP",
+    "shipment": "ပို့ဆောင်ခြင်းများ",
+    "shipment.title": "ပို့ဆောင်ခြင်းများ",
+    "shipment.new": "ပို့ဆောင်ခြင်း အသစ်",
+    "shipment.new.title": "ပို့ဆောင်ခြင်း အသစ်",
+    "shipment.edit.title": "ပို့ဆောင်ခြင်း ပြင်ဆင်ခြင်း",
+    "shipment.type": "Pickup/Drop-off",
     "shipment.date": "Pickup Date",
+    "shipment.time": "Pickup Time",
     "shipment.location_time": "Pickup Location / Time",
+    "shipment.location": "Pickup Location",
     "shipment.information": "Pickup Informations",
     "shipment.recipient_information": "Recipient Informations",
     "shipment.from":"From",
     "shipment.to":"To",
+    "shipment.box.delivery":"Delivery Address",
     "Shipment End ================================================================":"",
 
     "Rate Start ================================================================":"",
@@ -374,31 +384,38 @@
     "delivery_address.phonenumber": "ဖုန်းနံပါတ်",
     "delivery_address.create": "ပြုလုပ်ရန်",
     "delivery_address.update": "ပြုပြင်ရန်",
-    "delivery_address.new_address":"လိပ်စာအသစ်",
+    "delivery_address.new_address":"လိပ်စာ အသစ်",
     "delivery_address.change_address": "လိပ်စာပြောင်းပါ",
+    "delivery_address.delete.confirm":"ပို့ဆောင်ရမည့်လိပ်စာကို ဖျက်မလား?",
     "delivery_addresses End ================================================================":"",
 
     "Receiving Start ================================================================":"",
     "receiving.title":"လက်ခံခြင်းများ",
-    "receiving.new":"လက်ခံခြင်းအသစ်",
+    "receiving.info":"လက်ခံခြင်း",
+    "receiving.new":"လက်ခံခြင်း အသစ်",
+    "receiving.update":"လက်ခံခြင်း ပြင်ဆင်ခြင်း",
     "receiving.tracking.id":"Tracking ID",
     "receiving.remark":"မှတ်ချက်",
     "receiving.fcs.id":"FCS ID",
     "receiving.name":"နာမည်",
     "receiving.phone":"ဖုန်းနံပါတ်",
     "receiving.create_btn":"လက်ခံမည်",
+    "receiving.update_btn":"ပြင်ဆင်မည်",
+    "receiving.delete.confirm":"လက်ခံခြင်းကို ဖျက်မလား?",
     "Receiving End ================================================================":"",
 
     "Processing Start ================================================================":"",
-    "processing.title":"မွမ်းမံခြင်းများ",
-    "processing.info.title":"အထုပ်",
+    "processing.title":"လုပ်ဆောင်ခြင်းများ",
+    "processing.info.title":"လုပ်ဆောင်ခြင်း",
     "processing.tracking.id":"Tracking ID",
     "processing.name":"နာမည်",
+    "processing.phone":"ဖုန်းနံပါတ်",
+    "processing.fcs.id":"FCS ID",
     "processing.market":"အွန်လိုင်စျေးဆိုင်",
     "processing.status":"အခြေအနေ",
     "processing.desc":"ဖော်ပြချက်",
     "processing.remark":"မှတ်ချက်",
-    "processing.edit.title":"အထုပ် ပြင်ဆင်ခြင်း",
+    "processing.edit.title":"လုပ်ဆောင်ခြင်း",
     "processing.delete.confirm":"အထုပ်ကို ဖျက်မလား?",
     "processing.edit.sub_title":"မွမ်းမံခြင်း",
     "processing.edit.complete.btn":"မွမ်းမံခြင်း ပြီးဆုံးသည်",