am 31594acd: (-s ours) am 66c0bba1: (-s ours) Import translations. DO NOT MERGE

* commit '31594acd60d903050a7f25f88c8651f33226cdf8':
  Import translations. DO NOT MERGE