Merge "Swap german alias order for img_thumbnail and img_manualthumb"