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

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