am 48b5f4b1: (-s ours) am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '48b5f4b17677c60f6a2ff75bcc50a56182371b07':
  Import translations. DO NOT MERGE