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

* commit '7d7164361e3e9cf9198fca4050fca81547053b04':
  Import translations. DO NOT MERGE