am 9757bed9: (-s ours) am 4a9fca80: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9757bed90a173dd59526b1e36360ce0401f70dda':
  Import translations. DO NOT MERGE