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

* commit '50bdac61a10c5d0296dc0de7ad6c7f4ed59186f6':
  Import translations. DO NOT MERGE