am 608d9db2: (-s ours) am b3186207: (-s ours) am 68e70f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '608d9db23d1f09381400f3796ae7cb98527a5c11':
  Import translations. DO NOT MERGE