am c9cd45b3: (-s ours) am d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'c9cd45b321a834d20629ff9dc91fec2ccce79f7c':
  Import translations. DO NOT MERGE
tree: dbb180d3bd72522bc8cab4c1f8cc2590239b7da2
  1. res/
  2. src/