am faaf61d1: (-s ours) am 2736ea5e: (-s ours) Import translations. DO NOT MERGE

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