am 4d17b954: (-s ours) am 2f12b803: (-s ours) am eded9424: (-s ours) Import translations. DO NOT MERGE

* commit '4d17b9549e0223b1efb2b66cf71e36b7a56420ee':
  Import translations. DO NOT MERGE