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

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