am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d'

* commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d':
  Import revised translations.  DO NOT MERGE
tree: 3fdaaf7116dea950a9754e000a266c2674b8cfdd
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE