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

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