Merge "Update end now text in case language has changed."