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

* commit 'd89198df612183e16d6cd8206ee354ae98606756':
  Import translations. DO NOT MERGE
tree: 59489633a253607fd59bb34b0ffd21813420e205
  1. res-common/
  2. src/
  3. tests/