The same parameter could be used for singular and plural form
Merge branch 'norbe-patch-2'

* norbe-patch-2:
  The same parameter could be used for singular and plural form