am 2f15355b: (-s ours) am e055bcff: (-s ours) Import translations. DO NOT MERGE

* commit '2f15355b1804ed9f73bf8b7c58ae85b38f52e358':
  Import translations. DO NOT MERGE