am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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