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

* commit '79bcca2311c48552a6fed8b441e65568fc889da8':
  Import translations. DO NOT MERGE