am be00864e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:55:59 +0000 (13:55 -0700)]
* commit 'be00864e2f3a73a7e7dbc6d435094e25e0e7cc40':
  Import translations. DO NOT MERGE


Trivial merge