Merge "Mark configuration strings as non-translatable"