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

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