am 12336a59: (-s ours) am c11c43ee: (-s ours) am b923efba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '12336a59adf77f5dd702ac03e89184a1cb2123e9':
  Import translations. DO NOT MERGE