am b3d69bf9: (-s ours) am ca5d413e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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