Add the ability to edit a shipment's tracking number
Fix translation conflicts for shipment