am 626bbd23: (-s ours) am 5b40f4fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '626bbd23cf3476af5b52779504a41f36cfc0026b':
  Import translations. DO NOT MERGE