am be643364: (-s ours) am 25f9f364: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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