am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE

* commit '869df29e9125942bee858276698f02204b5273cf':
  Import translations. DO NOT MERGE