am 2a6d8015: (-s ours) am 688cd80c: (-s ours) am deb0189c: (-s ours) am 4b67a56b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2a6d8015c5d150b1cd729ab96a5d03dc44a0375a':
  Import translations. DO NOT MERGE