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

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