Merge "Strings for mini-resolver UI. Not yet used - getting them in for string freeze." into sc-dev