am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '814b0b734772bfdbaa6b1888a253afc00c78bb58':
  Import translations. DO NOT MERGE