am 6164b166: (-s ours) am 840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '6164b1666b571905dd313e542ceb9adcaf6e6803':
  Import translations. DO NOT MERGE