am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE

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