Changed waiting options as suggested in #4501

Always show: Wait until dusk/noon/midnight/dawn
New option: Wait until weather changes