am ac572525: (-s ours) am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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