Merge change I5ee7b933 into eclair

* changes:
  Mark a ContactsProvider string as being untranslatable.