i18n: fix double-space

* cannot
* backwards compatibility

Change-Id: I457e89cdd5f5b9fcb0f305e07ea18a4ee5dd7f7a
Merge "i18n: fix double-space"