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

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