am 1ef5cd37: (-s ours) am bc405e76: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 18:21:23 +0000 (10:21 -0800)]
* commit '1ef5cd3768262b8c5c079d4522a3d4a39c3153eb':
  Import translations. DO NOT MERGE


Trivial merge