am b4f1c7f1: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 Oct 2014 07:00:58 +0000 (07:00 +0000)]
* commit 'b4f1c7f17429dec5683447f8bf9674da6feb70d0':


Trivial merge