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

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