Merge "Edit strings related to calendar permissions, bug 2463956."