Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -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 ================================================================":"",
|
||||
|
||||
Reference in New Issue
Block a user