am 1b1c5777: (-s ours) am 7460b6e0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 Oct 2014 07:00:59 +0000 (07:00 +0000)]
* commit '1b1c5777ba1f828810ecea762afa9e0e462f0ad9':


Trivial merge