am ce76c434: (-s ours) am 9aa75f29: (-s ours) am ccfd6f44: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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