am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7aa56efd7399b0628bde655c535fac6407eaade9':
  Import translations. DO NOT MERGE