am 63e87c68: (-s ours) am 8689b2f5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '63e87c686c8007389ce584f525e15573b6d1aad3':
  Import translations. DO NOT MERGE