am f00ca818: (-s ours) am 0ac27a82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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