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

* commit '52b64bc6d0418fbb2ec40e883f1003f5da22f3ad':
  Import translations. DO NOT MERGE