am b3186207: (-s ours) am 68e70f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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