am 338cb79c: (-s ours) am e5449a3b: (-s ours) am eba7c748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '338cb79cbc478342f51109b85a3fba8743633dd2':
  Import translations. DO NOT MERGE