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

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