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

* commit '17b489f374fc878e2118a095511e209dd69ce3d4':
  Import translations. DO NOT MERGE