am d67a5954: (-s ours) am ffe16062: Import translations. DO NOT MERGE

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