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

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