Merge "Change the syntax and non-one count fake values for {{PLURAL: in newmessages*"