am 4365d431: (-s ours) am 3e477515: (-s ours) Import translations. DO NOT MERGE

* commit '4365d431de09aab4324c60ee38ac8a0f768ac556':
  Import translations. DO NOT MERGE