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

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