am 15098b11: (-s ours) am 984c63c0: (-s ours) Import translations. DO NOT MERGE

* commit '15098b117c855041b9cb2e42156827892d6009ea':
  Import translations. DO NOT MERGE