am 6394e1e0: (-s ours) am ba78a70c: (-s ours) am 548622a2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '6394e1e0d94f024cbf0f657a0c6cf213107b68c4':
  Import translations. DO NOT MERGE