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

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