am a2571fee: (-s ours) am 215f2f83: (-s ours) am da13330d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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