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

* commit '3d2ecd1452815f0c49bcd387e5f9c9ae33f513c8':
  Import translations. DO NOT MERGE