Don't assume the difference between the singular and plural is only 1
character.

E.g. in German, it's Favorit vs. Favoriten.

Change-Id: I39780574ab69d0c3f9e51343e37ec9540510025c
Merge "Don't assume the difference between the singular and plural is only 1 character." into cm-10.1