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

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