Issue #247 - Restore translatable keys

* On the previous merge develop -> feature branch, it seems that we lost
  some translatable keys