am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5d819bef3f4bf97c87032cc403e859b1d0d6797a':
  Import translations. DO NOT MERGE