am c5d3d025: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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