am 1d690c8a: (-s ours) am 92ce2809: am 542960fb: Import translations. DO NOT MERGE

* commit '1d690c8a09603705052da022648ddd18a42de614':
  Import translations. DO NOT MERGE