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

* commit '93360f022ec67bb994f04f9799bfac32997f0d00':
  Import translations. DO NOT MERGE