am aaebc99e: (-s ours) am 7f0a85d0: (-s ours) Import translations. DO NOT MERGE

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