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

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