am f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'f36d8f299d57849a1afb1b0c271bb4be0d336e43':
  Import revised translations. DO NOT MERGE
tree: b982c85b251ab968a90f8ce8054b46617eb964a1
  1. res/
  2. src/