am 3c8bbd2f: (-s ours) am 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '3c8bbd2fdc3381b70842cc165d57e7732cdc6e5c':
  Import translations. DO NOT MERGE