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

* commit 'b923efba489bb6f24214c1673e60ac33fc21c6f0':
  Import translations. DO NOT MERGE