Fixing minor issues with source strings and add Plural Forms support.

Fix #1465
Fix #1488