am 8608b163: (-s ours) am e02cb223: (-s ours) Import translations. DO NOT MERGE

* commit '8608b1636a6cb6f53429c0bcac5beda997c49b0a':
  Import translations. DO NOT MERGE