am 7fdb7ee7: (-s ours) am 5a9c61e3: (-s ours) am 8f13241c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7fdb7ee70ad206c41ac4e8129efcb32f8f058cd1':
  Import translations. DO NOT MERGE