am 12583441: (-s ours) am 39a12d16: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '12583441fddf38a0769b08d5a187e5a2405cb531':
  Import translations. DO NOT MERGE