am 3b8d5128: (-s ours) am 8bf6470a: (-s ours) Import translations. DO NOT MERGE

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