am c1ed7f3b: (-s ours) am 322554a0: (-s ours) Import translations. DO NOT MERGE

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