am 5a04fb76: (-s ours) am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5a04fb76dacbc6b0e030f726f4a03642a108b4dd':
  Import translations. DO NOT MERGE