am a67fc7b7: (-s ours) am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'a67fc7b7429124909e9dee83062a38e98be2d913':
  Import translations. DO NOT MERGE