okapi r583: waypoint-related changes and fixes
table definition and translation fixes