am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '810267c309f018c5b58b0a2e787b8a6434faa0e0':
  Import translations. DO NOT MERGE