am 64cb0d20: (-s ours) am 7460b6e0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:19:53 +0000 (22:19 +0000)]
* commit '64cb0d20fdd097b73cab76add01787c590aefefa':
  Import translations. DO NOT MERGE


Trivial merge