am e7fec206: (-s ours) am 780ac803: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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