am 12b83163: (-s ours) am b184a168: am 7e5fc453: am 9d45abd4: Import translations. DO NOT MERGE

* commit '12b83163faa2815a762669b285ed7e223f40286a':
  Import translations. DO NOT MERGE