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

* commit '9b16d1313fc1c81e356c0dcb39d0bf8f67b90161':
  Import translations. DO NOT MERGE