am 13b204f8: (-s ours) am 48557d6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '13b204f82b098e06c7f13a1c67bec702c63c1a28':
  Import translations. DO NOT MERGE