am 128f5efa: (-s ours) am 89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '128f5efa7680b0a21e17c1a7ad7351ee031a4fd1':
  Import translations. DO NOT MERGE