am 99c89bd4: (-s ours) am 0e3b0e89: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '99c89bd49932e6ebac2ef03dfb6f635320e7f64f':
  Import translations. DO NOT MERGE