am 480f83cf: (-s ours) am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '480f83cfc661e437c77e6faa67a754ae22cee1d6':
  Import translations. DO NOT MERGE