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

* commit 'cd2a75b5c47a71f665e8f2020ead8b98dd418373':
  Import translations. DO NOT MERGE