Untranslatable strings and formatting of the raster min/max label
Fix remote merge conflicts