A disagreement over wages that resulted in a national three-week strike involving up to 3,000 South African cotton sector workers has been settled.