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

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