am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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