am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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