am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e':
  Import translations. DO NOT MERGE