Replace :count lang choice
Merge pull request #2396 from PhiloNL/patch/choice-number

Replace :count lang choice