am 3b292202: (-s ours) am 6ace2bc9: (-s ours) Import translations. DO NOT MERGE

* commit '3b292202c0bafcb2e5667202de699efbcd1d9c9b':
  Import translations. DO NOT MERGE