am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '24c2980cb2a9a93d1d6fe2a849f915b3819056c2':
  Import translations. DO NOT MERGE