am 79dcd8f4: (-s ours) am 3715fb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '79dcd8f4ffa82895fea8975b8ae4b9da287ad8a9':
  Import translations. DO NOT MERGE