am 88c7be32: (-s ours) am a643895b: (-s ours) am 1c4211f9: (-s ours) am bd9a11d2: (-s ours) Import translations. DO NOT MERGE

* commit '88c7be328340b38dd9578af67aca41c8e1adbaa3':
  Import translations. DO NOT MERGE