am 023c36e3: (-s ours) am 8487eea1: (-s ours) am 6d2708d9: (-s ours) Import translations. DO NOT MERGE

* commit '023c36e3111270286fca09c9e336fb68f9a14f53':
  Import translations. DO NOT MERGE