am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'c7a535c552f8853076ba104e7948f7c1d324d47a':
  Import translations. DO NOT MERGE