Merge "Make "1 more" a plurals for translation purposes" into mnc-dev