am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '74a503fddf2626f6aedec486e9b30c4beb6377e2':
  Import translations. DO NOT MERGE