am f625246b: (-s ours) am fcc395b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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