Merge "Add extra strings for 'tomorrow' text" into pi-dev