am a4a4b85d: (-s ours) am 6ed30705: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 17:24:20 +0000 (17:24 +0000)]
* commit 'a4a4b85d344fb6d2b571023c1b1b7d2877c7bbc6':
  Import translations. DO NOT MERGE


Trivial merge