am 783b4c7c: (-s ours) am 626bbd23: (-s ours) am 5b40f4fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '783b4c7c44fecf6bd90617f03bab163301e85693':
  Import translations. DO NOT MERGE