am 78c87758: (-s ours) am 971ca440: (-s ours) am d2eab38a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '78c87758d04d92caf79ee0c47ad0cca9fef9cedd':
  Import translations. DO NOT MERGE