am 4318c12c: (-s ours) am c153cb57: (-s ours) Import translations. DO NOT MERGE

* commit '4318c12c3c0a84f8f434c4b24917e8fc33af2d25':
  Import translations. DO NOT MERGE