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

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