am 93a1154f: (-s ours) am a57076e8: (-s ours) am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '93a1154fbf3b2eb30bc721df3b16f6c52151475e':
  Import translations. DO NOT MERGE