am 4c2fddc6: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 18:39:52 +0000 (11:39 -0700)]
* commit '4c2fddc6281587d86f29d634089e76ca4df796a2':
  Import translations. DO NOT MERGE


Trivial merge