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

* commit '6db722776b1486072724a6d361ba474835cf055e':
  Import translations. DO NOT MERGE