am 5054aebd: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:40:21 +0000 (15:40 +0000)]
* commit '5054aebdd945d95ea59d4d7e2e430d29fc4642c7':
  Import translations. DO NOT MERGE


Trivial merge