am bb8c1043: (-s ours) Import translations. DO NOT MERGE

* commit 'bb8c104317a8f12e34ef068c513a8f9a559830ed':
  Import translations. DO NOT MERGE