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

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