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

* commit '09fbf3517a9be35e180f056ed0ffbc280e7c5087':
  Import translations. DO NOT MERGE