am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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