am ddaf6e73: (-s ours) am 4ee527a4: (-s ours) am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'ddaf6e739041fb0cc65e08fe6866eb31e00dfae1':
  Import translations. DO NOT MERGE