am 63f898ac: (-s ours) am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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