Merge remote-tracking branch 'upstream/master'

This commit is contained in:
PhyoThandar
2020-10-12 09:19:20 +06:30
70 changed files with 2505 additions and 1755 deletions

View File

@@ -92,6 +92,8 @@
"Home Start ================================================================":"",
"home.invitation.request.msg":"We are working on your invitation request!",
"home.search":"Enter tracking number",
"home.search.btn":"Search",
"Home End ================================================================":"",
"Invite Start ================================================================":"",
@@ -109,7 +111,6 @@
"user.fcs_id":"MY FCS_ID",
"user.shipping_address":"USA SHIPPING ADDRESS",
"user.deliveryAddress":"My delivery address",
"user.form.shipping_address":"ADDRESS",
"User End ================================================================":"",
"Customer Start ================================================================":"",
@@ -142,15 +143,17 @@
"Profile Start ================================================================":"",
"profile.title": "My Profile",
"profile.edit_title": "Edit My Profile",
"profile.edit.currency.title":"Preferred Currency",
"profile.name": "Name",
"profile.phone": "Phone",
"profile.language": "Languages",
"profile.logout": "logout",
"profile.currency":"Preferred Currency",
"profile.usa.shipping.address": "USA Shipping Address",
"profile.logout.confirm":"Are you sure want to logout?",
"profile.devices":"Devices",
"profile.email":"Email",
"profile.privilege":"Privilege",
"profile.privileges":"Privileges",
"Profile End ================================================================":"",
"Package Start ================================================================":"",
@@ -176,6 +179,8 @@
"package.rate":"Rate",
"package.weight":"Weight",
"package.amount":"Amount",
"package.popupmenu.active":"Active Packages",
"package.popupmenu.delivered":"Delivered Packages",
"Package End ================================================================":"",
"Market Start ================================================================":"",
@@ -286,15 +291,20 @@
"Shipment Start ================================================================":"",
"shipment": "Shipments",
"shipment.title": "SHIPMENTS",
"shipment.title": "Shipments",
"shipment.new": "New Shipment",
"shipment.edit.title": "SHIPMENT",
"shipment.new.title": "New Shipment",
"shipment.edit.title": "Edit Shipment",
"shipment.type": "Pickup/Drop-off",
"shipment.date": "Pickup Date",
"shipment.time": "Pickup Time",
"shipment.location": "Pickup Location",
"shipment.location_time": "Pickup Location / Time",
"shipment.information": "Pickup Informations",
"shipment.recipient_information": "Recipient Informations",
"shipment.from":"From",
"shipment.to":"To",
"shipment.box.delivery":"Delivery Address",
"Shipment End ================================================================":"",
"Rate Start ================================================================":"",
@@ -375,29 +385,36 @@
"delivery_address.update": "Update Delivery Address",
"delivery_address.new_address":"Add New\nAddress",
"delivery_address.change_address": "Change Address",
"delivery_address.delete.confirm":"Delete this Delivery Address?",
"delivery_addresses End ================================================================":"",
"Receiving Start ================================================================":"",
"receiving.title":"Receiving",
"receiving.title":"Receivings",
"receiving.info":"Receiving",
"receiving.new":"New Receiving",
"receiving.update":"Update Reveiving",
"receiving.tracking.id":"Tracking ID",
"receiving.remark":"Remark",
"receiving.fcs.id":"FCS ID",
"receiving.name":"Customer Name",
"receiving.phone":"Phone Number",
"receiving.create_btn":"Complete receiving",
"receiving.update_btn":"Update reveiving",
"receiving.delete.confirm":"Delete this receiving?",
"Receiving End ================================================================":"",
"Processing Start ================================================================":"",
"processing.title":"Processing",
"processing.info.title":"Package",
"processing.info.title":"Processing",
"processing.tracking.id":"Tracking ID",
"processing.name":"Customer Name",
"processing.phone":"Phone Number",
"processing.fcs.id":"FCS ID",
"processing.market":"Market",
"processing.status":"Status",
"processing.desc":"Description",
"processing.remark":"Remark",
"processing.edit.title":"Edit Package",
"processing.edit.title":"Processing",
"processing.delete.confirm":"Delete this package?",
"processing.edit.sub_title":"Processing",
"processing.edit.complete.btn":"Complete processing",