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

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