Bug 940772 - Dehardcode the plural macro. r=gandalf
Merge pull request #23806 from stasm/940772-dehardcode-plural

Bug 940772 - Dehardcode the plural macro. r=gandalf