am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE

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