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

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